]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 21 Jun 2013 07:13:27 +0000 (15:13 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 21 Jun 2013 07:13:27 +0000 (15:13 +0800)
commitfb229f257b06b0def985ac15cf24bd08520b36b5
tree16110074230e4061496b5af84222abff4acb309b
parenta77fd2a08494c4926f31673c7cd3cf1077131aa6
parent35159eae0369f699f7215908da466f859e2005b7
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto

Merge crypto to resolve conflict in crypto/Kconfig.