]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Mar 2013 20:46:20 +0000 (13:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Mar 2013 20:46:20 +0000 (13:46 -0700)
commit7df08dbf536b6ebe03eb408560ba76ad3ab83b41
treed9583a91a298112188d902bb30ce7359bf68ccf4
parent6ccce2c214782914c348b8064e700f1d3380aef6
parent56a3c45ccc3a15f732d1ce498f8b1b08859e6823
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"