]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcf741c 019d62d)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 5 Jul 2017 07:17:26 +0000 (15:17 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 5 Jul 2017 07:17:26 +0000 (15:17 +0800)
Merge the crypto tree to pull in fixes for the next merge window.

1  2 
drivers/crypto/caam/caampkc.c patch | diff1 | diff2 | blob | history

diff --cc drivers/crypto/caam/caampkc.c
Simple merge
Linux Kernel Source Tree.