From: Linus Torvalds Date: Sat, 5 Dec 2015 18:46:44 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=9cfe5212745a41fbe7cba1a74289f5c66fc45c1f;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fixes from Herbert Xu: "This fixes a couple of crypto drivers that were using memcmp to verify authentication tags. They now use crypto_memneq instead" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: talitos - Fix timing leak in ESP ICV verification crypto: nx - Fix timing leak in GCM and CCM decryption --- 9cfe5212745a41fbe7cba1a74289f5c66fc45c1f