]> 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)
commit900020a315e9092c1a45e73140cf6ee6187bb5bb
tree16110074230e4061496b5af84222abff4acb309b
parent504c273893cfbc47612a00ecc237ae1ff5e8b8ad
parent5499b74710fc1d33576766bfe015fb263f251464
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto

Merge crypto to resolve conflict in crypto/Kconfig.