Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 5 Apr 2017 13:57:07 +0000 (21:57 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 5 Apr 2017 13:57:07 +0000 (21:57 +0800)
commitc6dc0609062c6110d04c54e24b81b503eeadb2c8
treec8441197c74e9df8407a00eff2433540924ca5ce
parent796b40c6171456274b02447e1dbbea97456403fe
parent40c98cb57cdbc377456116ad4582c89e329721b0
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve conflict between caam changes.
drivers/crypto/caam/ctrl.c
drivers/crypto/caam/intern.h
drivers/crypto/ccp/ccp-dev-v5.c
drivers/crypto/ccp/ccp-dev.h
include/linux/ccp.h