From: Herbert Xu <herbert@gondor.apana.org.au>
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-Url: http://git.maquefel.me/?a=commitdiff_plain;h=51b259bb01fcfb372ae39332936055b18328946c;p=linux.git

Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve conflict in qat Makefile.
---

51b259bb01fcfb372ae39332936055b18328946c