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)
commit51b259bb01fcfb372ae39332936055b18328946c
treee0be652c70a772e7cc8a6ad6daa6d53e70a25d98
parent16dee78005be9908197c707393a3b6a61a14b4fb
parent81dc0365cfa7bc7c08a0e44d9ee04964df782e19
Merge git://git./linux/kernel/git/herbert/crypto-2.6

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