]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 173ae9b 70d906b)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2015 18:21:04 +0000 (10:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2015 18:21:04 +0000 (10:21 -0800)
commitca43444e4342e9ce38202fb1082d38a7afa8f977
tree3400d3466c252957ead4c87a19e5784cd1bf299ctree | snapshot
parent173ae9ba63349194ae180622f05fb49f55a4df46commit | diff
parent70d906bc17500edfa9bdd8c8b7e59618c7911613commit | diff
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a boundary condition in the blkcipher SG walking code that
  can lead to a crash when used with the new chacha20 algorithm"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: skcipher - Copy iv from desc even for 0-len walks
Linux kernel for KaRo TX COM modules