Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jul 2014 06:25:54 +0000 (20:25 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Jul 2014 06:25:54 +0000 (20:25 -1000)
Pull crypto fixes from Herbert Xu:
 "This push fixes a boot hang in virt guests when the virtio RNG is
  enabled"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: virtio - ensure reads happen after successful probe
  hwrng: fetch randomness only after device init


Trivial merge