tree 3bccc69ab1d228520094fe83bbc969e9a0a8b432
parent e79323bd87808fdfbc68ce6c5371bd224d9672ee
parent eb4a5346e777784f1b5ae9fd0c29b96344bdc3ae
author Linus Torvalds <torvalds@linux-foundation.org> 1397516654 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1397516654 -0700

Merge git://git.kernel.org/pub/scm/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