From: Linus Torvalds Date: Fri, 24 Mar 2017 21:11:36 +0000 (-0700) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e8fe23ffc9bb43cbaade86dfb0701fb35b785d06;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "This fixes regressions in the crypto ccp driver and the hwrng drivers for amd and geode" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: hwrng: geode - Revert managed API changes hwrng: amd - Revert managed API changes crypto: ccp - Assign DMA commands to the channel's CCP --- e8fe23ffc9bb43cbaade86dfb0701fb35b785d06