git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16dee78 81dc036)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 21 Jul 2016 04:26:55 +0000 (12:26 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 21 Jul 2016 04:26:55 +0000 (12:26 +0800)
Merge the crypto tree to resolve conflict in qat Makefile.

1  2 
crypto/crypto_user.c patch | diff1 | diff2 | blob | history

diff --cc crypto/crypto_user.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.