From: Linus Torvalds Date: Sat, 13 Nov 2010 17:55:56 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: firefly_0821_release~7613^2~3438 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0caf7bcbfedb3f79ccec759b221bfef0646ada3;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: padlock - Fix AES-CBC handling on odd-block-sized input crypto: n2 - dubious error check --- c0caf7bcbfedb3f79ccec759b221bfef0646ada3