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)
commit48d4e137ea3174dc77efe1cc20570e95af2ffc9e
treee363b7141778c95bb4595477c869870954486007
parent9023a4093d6594040fb8142cdd2615d3461caa7a
parentc475c06f4bb689d6ad87d7512e036d6dface3160
Merge git://git./linux/kernel/git/herbert/crypto-2.6

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