]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit52c5b88a0eb52a947d3879c6cebcc0cfedf8fe8e
treee0be652c70a772e7cc8a6ad6daa6d53e70a25d98
parent5747570ed0f31c3208c449372b35615ffb9d508b
parent640d7694131929732aa912b04a8da85b1407a0f4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve conflict in qat Makefile.
crypto/crypto_user.c