projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite90c48efde40f8428777424e6edbbb240b441652
treec023a7a8fa0255f03040c63a73068eaaca03f1aftree | snapshot (tar.gz zip)
parentef4064bb3f6a1037cbda8d025f564aab5bd2de35commit | diff
parent445a582738de6802669aeed9c33ca406c23c3b1fcommit | diff
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve the conflict between the temporary
and long-term fixes in algif_skcipher.