diff options
author | 2013-03-28 13:46:20 -0700 | |
---|---|---|
committer | 2013-03-28 13:46:20 -0700 | |
commit | 8b1e54c48f3298ac84cafca13ad65901117b43a9 (patch) | |
tree | d9583a91a298112188d902bb30ce7359bf68ccf4 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 (diff) | |
parent | Revert "crypto: caam - add IPsec ESN support" (diff) | |
download | linux-dev-8b1e54c48f3298ac84cafca13ad65901117b43a9.tar.xz linux-dev-8b1e54c48f3298ac84cafca13ad65901117b43a9.zip |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions