Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jul 2013 18:05:18 +0000 (11:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Jul 2013 18:05:18 +0000 (11:05 -0700)
commitb48a97be8e6c2afdba2f3b61fd88c3c7743fbd73
treec5b9258be43d7f4e2ec1d91e4b83820562fbaebb
parent04012e3076943f17c8cfc77a196701c8f0b8964f
parente70308ec0e4bff344fcfdf160de40e1150552c5f
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fixes from Herbert Xu:
 "This push fixes a memory corruption issue in caam, as well as
  reverting the new optimised crct10dif implementation as it breaks boot
  on initrd systems.

  Hopefully crct10dif will be reinstated once the supporting code is
  added so that it doesn't break boot"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  Revert "crypto: crct10dif - Wrap crc_t10dif function all to use crypto transform framework"
  crypto: caam - Fixed the memory out of bound overwrite issue
crypto/Kconfig
crypto/Makefile
lib/Kconfig