]> 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)
commit815a3a70e0b9daf58c5af218017d2c664fb0bb64
treee0be652c70a772e7cc8a6ad6daa6d53e70a25d98
parentdbd2acecb41bc3a8319db3767da185899c630158
parent6ebcf74686417fb849f7875b1972b146cebccf05
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