Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 Apr 2016 01:13:03 +0000 (09:13 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 28 Apr 2016 01:13:03 +0000 (09:13 +0800)
commit6f6438975d6a1afb0f0ac18176ede4e667020db0
tree11b7ee504210dd7ce7bb3318c1aabbf60759c717
parent79152e8d085fd64484afd473ef6830b45518acba
parent9e209fcfb804da262e38e5cd2e680c47a41f0f95
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in the qat adf_init_pf_wq change.
drivers/crypto/qat/qat_common/adf_common_drv.h
drivers/crypto/qat/qat_common/adf_ctl_drv.c
drivers/crypto/qat/qat_common/adf_sriov.c
drivers/crypto/talitos.c