OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
213e4eb
8c75704
)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 24 Mar 2017 21:11:36 +0000
(14:11 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 24 Mar 2017 21:11:36 +0000
(14:11 -0700)
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
Trivial merge