From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2009 23:17:24 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: v2.6.32~32
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=52c7b3f45dbf19359be60a95b8678656e73ce42b;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/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
---

52c7b3f45dbf19359be60a95b8678656e73ce42b