From: Herbert Xu Date: Tue, 22 Aug 2017 06:53:32 +0000 (+0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e90c48efde40f8428777424e6edbbb240b441652;p=linux.git Merge git://git./linux/kernel/git/herbert/crypto-2.6 Merge the crypto tree to resolve the conflict between the temporary and long-term fixes in algif_skcipher. --- e90c48efde40f8428777424e6edbbb240b441652