Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 4 Aug 2015 12:44:35 +0000 (20:44 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 4 Aug 2015 12:44:35 +0000 (20:44 +0800)
Merge the crypto tree to pull in the qat registration bug fix.


Trivial merge