Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 19:20:36 +0000 (12:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 19:20:36 +0000 (12:20 -0700)
Pull a crypto fix from Herbert Xu:
 "This push fixes another bug in the atmel-rng that made it produce
  completely useless output."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: atmel-rng - fix data valid check


Trivial merge