Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Tue, 3 May 2016 08:01:52 +0000 (16:01 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 3 May 2016 08:01:52 +0000 (16:01 +0800)
commit6dd4c83ed7e28309c03b0c267f1473fc3e7db9f1
tree8c41d6a1a61b26b660ecef59006760cd9fa2ffdb
parentd1497977fecb9acce05988d6322ad415ef93bb39
parent6dc5df71ee5c8b44607928bfe27be50314dcf848
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in the qat adf_init_pf_wq fix.
drivers/crypto/qat/qat_common/adf_common_drv.h