]> 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>
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)
commit3ef56923f55f510e8552e3e80048b0f7e94558ae
treee0be652c70a772e7cc8a6ad6daa6d53e70a25d98
parent815a3a70e0b9daf58c5af218017d2c664fb0bb64
parent6f60de52246bbd57e7c2fe44d75a7242762d1016
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to resolve conflict in rsa-pkcs1pad.