]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfcf333fd9985d626893c3813290641f1af39e328
treec8441197c74e9df8407a00eff2433540924ca5ce
parent331412ceb346e94d205da21b7944c84bc4bf4651
parentb5d03423bda6cf706ad086382c2dfc7de109f228
Merge git://git.kernel.org/pub/scm/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