Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2015 16:03:52 +0000 (09:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 May 2015 16:03:52 +0000 (09:03 -0700)
commitd9cee5d4f66ef36f69b0108dedbad7f7009bb6a8
tree14dcf7cb49a884de4b5c55c5757f935c12462719
parentc02d7da3dd00cb32b58d9c87240456e19eebcc42
parentf440c4ee3e53f767974fe60bcbc0b6687a5fb53f
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes a build problem with bcm63xx and yet another fix to the
  memzero_explicit function to ensure that the memset is not elided"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: bcm63xx - Fix driver compilation
  lib: make memzero_explicit more robust against dead store elimination