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)
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


Trivial merge