summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-25 15:26:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-25 15:26:51 -0800
commit13391c60da3308ed9980de0168f74cce6c62ac1d (patch)
tree534fdd1189cd67cd0181b0556b2e027e721e49c8 /kernel
parentf8ad8187c3b536ee2b10502a8340c014204a1af0 (diff)
parent4f6543f28bb05433d87b6de6c21e9c14c35ecf33 (diff)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "Fix a regression in the cesa driver" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: marvel/cesa - Fix tdma descriptor on 64-bit
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions