| commit | 51b259bb01fcfb372ae39332936055b18328946c | [log] [tgz] |
|---|---|---|
| author | Herbert Xu <herbert@gondor.apana.org.au> | Thu Jul 21 12:26:55 2016 +0800 |
| committer | Herbert Xu <herbert@gondor.apana.org.au> | Thu Jul 21 12:26:55 2016 +0800 |
| tree | e0be652c70a772e7cc8a6ad6daa6d53e70a25d98 | |
| parent | 16dee78005be9908197c707393a3b6a61a14b4fb [diff] | |
| parent | 81dc0365cfa7bc7c08a0e44d9ee04964df782e19 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Merge the crypto tree to resolve conflict in qat Makefile.