From: Linus Torvalds 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: firefly_0821_release~11823 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=52c7b3f45dbf19359be60a95b8678656e73ce42b;p=firefly-linux-kernel-4.4.55.git 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 --- 52c7b3f45dbf19359be60a95b8678656e73ce42b