Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Apr 2014 23:04:14 +0000 (16:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Apr 2014 23:04:14 +0000 (16:04 -0700)
commitdafe344d2288f0ebc0e3d4c6a5eb15bc82189c53
tree3bccc69ab1d228520094fe83bbc969e9a0a8b432
parente79323bd87808fdfbc68ce6c5371bd224d9672ee
parenteb4a5346e777784f1b5ae9fd0c29b96344bdc3ae
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull bmc2835 crypto fix from Herbert Xu:
 "This fixes a potential boot crash on bcm2835 due to the recent change
  that now causes hardware RNGs to be accessed on registration"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: bcm2835 - fix oops when rng h/w is accessed during registration