aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-28 13:46:20 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-28 13:46:20 -0700
commit8b1e54c48f3298ac84cafca13ad65901117b43a9 (patch)
treed9583a91a298112188d902bb30ce7359bf68ccf4 /arch
parentd3f72cfb7aa2c92debecacddf65fdef582f238a3 (diff)
parent246bbedb9aaf27e2207501d93a869023a439fce5 (diff)
downloadlinux-linaro-stable-8b1e54c48f3298ac84cafca13ad65901117b43a9.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu: "This removes IPsec ESN support from the talitos/caam drivers since they were implemented incorrectly, causing interoperability problems if ESN is used with them." * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: Revert "crypto: caam - add IPsec ESN support" Revert "crypto: talitos - add IPsec ESN support"
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions