From: Linus Torvalds Date: Wed, 11 Jan 2017 17:28:13 +0000 (-0800) Subject: Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: v4.10-rc4~30 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a6b6e6165057f55c4cd35780520275d3c46e4c82;p=linux-2.6-block.git Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6 Pull crypto fix from Herbert Xu: "This fixes a regression in aesni that renders it useless if it's built-in with a modular pcbc configuration" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: aesni - Fix failure when built-in with modular pcbc --- a6b6e6165057f55c4cd35780520275d3c46e4c82