Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Jul 2016 10:00:05 +0000 (18:00 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 22 Jul 2016 10:00:05 +0000 (18:00 +0800)
Merge the crypto tree to resolve conflict in rsa-pkcs1pad.


Trivial merge