From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: Ubuntu-snapdragon-4.4.0-1050.54~10457
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53;p=mirror_ubuntu-artful-kernel.git

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

dafe344d2288f0ebc0e3d4c6a5eb15bc82189c53