Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 7 Dec 2018 05:59:10 +0000 (13:59 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 7 Dec 2018 05:59:10 +0000 (13:59 +0800)
Merge crypto tree to pick up crypto stats API revert.

1  2 
crypto/cfb.c

diff --cc crypto/cfb.c
Simple merge