From: Linus Torvalds Date: Mon, 14 Apr 2014 23:04:14 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53