]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Mar 2017 21:11:36 +0000 (14:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Mar 2017 21:11:36 +0000 (14:11 -0700)
commite8fe23ffc9bb43cbaade86dfb0701fb35b785d06
treebff698de55b400dc90723d931ca1cfdcd9649248
parent213e4eb2da7e4fa716560b20752b05b80b5b0da9
parent8c75704ebcac2ffa31ee7bcc359baf701b52bf00
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 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