]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef4064b 445a582)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 22 Aug 2017 06:53:32 +0000 (14:53 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 22 Aug 2017 06:53:32 +0000 (14:53 +0800)
Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.


Trivial merge
local clone of linux.git