diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-21 12:26:55 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-07-21 12:26:55 +0800 |
| commit | 229dc263feee52590e5b04c1bbcbd71f181447f0 (patch) | |
| tree | ffa538c5aa65ccce27501f9636710ad6f14bc084 /crypto/kpp.c | |
| parent | 3dc18ac906a12dd2a2f602193b80748e75586442 (diff) | |
| parent | af900a7ee6a17784a9a343421ef0e3fe67f264fc (diff) | |
| download | linux-crypto-229dc263feee52590e5b04c1bbcbd71f181447f0.tar.gz linux-crypto-229dc263feee52590e5b04c1bbcbd71f181447f0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict in qat Makefile.
Diffstat (limited to 'crypto/kpp.c')
0 files changed, 0 insertions, 0 deletions