From: Linus Torvalds Date: Wed, 30 May 2018 21:33:22 +0000 (-0500) 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=c462f16b1a319991c59747e65837924a5ff17755;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "This fixes a potential kernel panic in the inside-secure driver" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: inside-secure - do not use memset on MMIO --- c462f16b1a319991c59747e65837924a5ff17755