Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
commit52c7b3f45dbf19359be60a95b8678656e73ce42b
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 23:17:24 +0000 (30 15:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 23:17:24 +0000 (30 15:17 -0800)
treea46a9c12a84062033dd6964507c36b9077216af3
parent5ebacb271242b3205b865efa1f40a12e981df79d
parent62c5593aea4b71d61dc0f37fea96c556c158a042
Merge git://git./linux/kernel/git/herbert/crypto-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: gcm - fix another complete call in complete fuction
  crypto: padlock-aes - Use the correct mask when checking whether copying is required