Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Nov 2010 17:55:56 +0000 (09:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Nov 2010 17:55:56 +0000 (09:55 -0800)
commitc0caf7bcbfedb3f79ccec759b221bfef0646ada3
tree53c4b5850b18a60e7feef1d10b255a18279cdbee
parentc22cff08db00ef0411be088956d7934681a1f988
parentc054a076a1bd4731820a9c4d638b13d5c9bf5935
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: padlock - Fix AES-CBC handling on odd-block-sized input
  crypto: n2 - dubious error check