tree 3d1acc687a810aaa51cdc08b4d20d8de888eec6a
parent 4c0b1c67c6250be73cedeac935b860e09de4420f
parent 47cd30608f3fc3dbb4fdf37300baca911e2dde34
author Linus Torvalds <torvalds@linux-foundation.org> 1460682940 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1460682940 -0700

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This fixes an NFS regression caused by the skcipher/hash conversion in
  sunrpc.  It also fixes a build problem in certain configurations with
  bcm63xx"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: bcm63xx - fix device tree compilation
  sunrpc: Fix skcipher/shash conversion