From: Herbert Xu Date: Thu, 21 Jul 2016 04:26:55 +0000 (+0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: v6.1~16185^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51b259bb01fcfb372ae39332936055b18328946c;p=sdk%2Femulator%2Femulator-kernel.git Merge git://git./linux/kernel/git/herbert/crypto-2.6 Merge the crypto tree to resolve conflict in qat Makefile. --- 51b259bb01fcfb372ae39332936055b18328946c