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)
commit1d6669fa83bc31b94f71ff12bbbed3516eefc705
tree72aceaf13b935638995c337d9e61204453967fbc
parent76bea64c4c8d7fa911eb485c4c2b8583e813331e
parent17fb874dee093139923af8ed36061faa92cc8e79
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in the qat registration bug fix.
drivers/crypto/qat/qat_common/qat_algs.c