From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Mar 2013 20:46:20 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8b1e54c48f3298ac84cafca13ad65901117b43a9;p=openwrt%2Fstaging%2Fblogic.git

Merge git://git./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"
---

8b1e54c48f3298ac84cafca13ad65901117b43a9