diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-05 09:17:26 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-07-05 09:17:26 +0200 |
| commit | 035f901eac4d2d0fd40f3055026355d55d46949f (patch) | |
| tree | 26e818b4365af13540927e3e44916cf228d1262c /crypto/crypto_engine.c | |
| parent | crypto: testmgr - Reenable sha1/aes in FIPS mode (diff) | |
| parent | crypto: caam - fix gfp allocation flags (part II) (diff) | |
| download | linux-035f901eac4d2d0fd40f3055026355d55d46949f.tar.xz linux-035f901eac4d2d0fd40f3055026355d55d46949f.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in fixes for the next merge window.
Diffstat (limited to 'crypto/crypto_engine.c')
0 files changed, 0 insertions, 0 deletions