From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 May 2015 16:03:52 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v4.1-rc3~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

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

d9cee5d4f66ef36f69b0108dedbad7f7009bb6a8