Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jun 2012 13:31:52 +0000 (16:31 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Jun 2012 13:31:52 +0000 (16:31 +0300)
commit4e3c8a1b1c63482403e9d5e3148dee1a711e4b91
tree513410a63a617436c94373fa5cf6273c3a85c47c
parentb0a4c6f2e3fce088eb597d4b9ee2075cb6399ee1
parent7c8d51848a88aafdb68f42b6b650c83485ea2f84
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This push fixes an unaligned fault on x86-32 with aesni-intel and an
  RNG failure with atmel-rng (repeated bits)."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: aesni-intel - fix unaligned cbc decrypt for x86-32
  hwrng: atmel-rng - fix race condition leading to repeated bits