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] geode: Fix not inplace encryption

+1 -2
+1 -2
drivers/crypto/geode-aes.c
··· 110 * we don't need to worry 111 */ 112 113 - if (op->src == op->dst) 114 - flags |= (AES_CTRL_DCA | AES_CTRL_SCA); 115 116 if (op->dir == AES_DIR_ENCRYPT) 117 flags |= AES_CTRL_ENCRYPT;
··· 110 * we don't need to worry 111 */ 112 113 + flags |= (AES_CTRL_DCA | AES_CTRL_SCA); 114 115 if (op->dir == AES_DIR_ENCRYPT) 116 flags |= AES_CTRL_ENCRYPT;