aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2017-07-05 15:17:26 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2017-07-05 15:17:26 +0800
commit035f901eac4d2d0fd40f3055026355d55d46949f (patch)
tree26e818b4365af13540927e3e44916cf228d1262c /arch
parentcrypto: testmgr - Reenable sha1/aes in FIPS mode (diff)
parentcrypto: caam - fix gfp allocation flags (part II) (diff)
downloadlinux-dev-035f901eac4d2d0fd40f3055026355d55d46949f.tar.xz
linux-dev-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 'arch')
0 files changed, 0 insertions, 0 deletions