Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Wed, 30 Nov 2016 11:53:12 +0000 (19:53 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 30 Nov 2016 11:53:12 +0000 (19:53 +0800)
commit479d014de544a0916037fcf77e873f815545cd5e
tree6752a8184e2f2696c31ab141576e9902410c6c75
parent585b5fa63da92b2d46d5c1735a5c46e9a1486bbe
parent57891633eeef60e732e045731cf20e50ee80acb4
Merge git://git./linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in chelsio chcr fix.
crypto/Makefile
crypto/drbg.c
drivers/crypto/caam/caamalg.c