tree 1b5558cff414274bbc07d1df6ca7cd743df20c4c
parent a54769c505db4bdf01d19dca64d15cb303503d71
parent 511d63cb19329235bc9298b64010ec494b5e1408
author Linus Torvalds <torvalds@linux-foundation.org> 1334945698 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334945698 -0700

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