From: Linus Torvalds Date: Wed, 16 Sep 2015 14:53:33 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aa57e0b281453334267e836d15cfdb933f6d6f97;p=openwrt%2Fstaging%2Fblogic.git Merge git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "This fixes the following issues: - The selftest overreads the IV test vector. - Fix potential infinite loop in sunxi-ss driver. - Fix powerpc build failure when VMX is set without VSX" * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: testmgr - don't copy from source IV too much crypto: sunxi-ss - Fix a possible driver hang with ciphers crypto: vmx - VMX crypto should depend on CONFIG_VSX --- aa57e0b281453334267e836d15cfdb933f6d6f97