From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Apr 2012 18:14:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v3.4-rc4~19
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=277b5fb35b770792f89fbe50df03daddb3fa9521;p=karo-tx-linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 - Locking fix for talitos driver
 - Fix 64-bit counter overflow in SHA-512
 - Build fix for ixp4xx.

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: talitos - properly lock access to global talitos registers
  crypto: ixp4xx - include fix
  crypto: sha512 - Fix byte counter overflow in SHA-512
---

277b5fb35b770792f89fbe50df03daddb3fa9521