Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 5 Jul 2017 07:17:26 +0000 (15:17 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 5 Jul 2017 07:17:26 +0000 (15:17 +0800)
commit035f901eac4d2d0fd40f3055026355d55d46949f
tree26e818b4365af13540927e3e44916cf228d1262c
parentbcf741cb779283081db47853264cc94854e7ad83
parent019d62db54017f4639fd7d4f6592f5a116a16695
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in fixes for the next merge window.
drivers/crypto/caam/caampkc.c