| commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 | [log] [tgz] |
|---|---|---|
| author | Herbert Xu <herbert@gondor.apana.org.au> | Wed Apr 05 21:57:07 2017 +0800 |
| committer | Herbert Xu <herbert@gondor.apana.org.au> | Wed Apr 05 21:57:07 2017 +0800 |
| tree | c8441197c74e9df8407a00eff2433540924ca5ce | |
| parent | 796b40c6171456274b02447e1dbbea97456403fe [diff] | |
| parent | 40c98cb57cdbc377456116ad4582c89e329721b0 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 Merge the crypto tree to resolve conflict between caam changes.