diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-04-05 21:57:07 +0800 |
| commit | c6dc0609062c6110d04c54e24b81b503eeadb2c8 (patch) | |
| tree | c8441197c74e9df8407a00eff2433540924ca5ce /drivers/crypto/stm32/Makefile | |
| parent | crypto: ixp4xx - Use sg_virt() (diff) | |
| parent | crypto: caam - fix RNG deinstantiation error checking (diff) | |
| download | linux-dev-c6dc0609062c6110d04c54e24b81b503eeadb2c8.tar.xz linux-dev-c6dc0609062c6110d04c54e24b81b503eeadb2c8.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict between caam changes.
Diffstat (limited to 'drivers/crypto/stm32/Makefile')
0 files changed, 0 insertions, 0 deletions