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)
commit02c0241b600e4ab8a732c89749e252165145d60c
tree16110074230e4061496b5af84222abff4acb309b
parentda5ffe11342a0ecf2cce7000a9392c9ca959e9c8
parentfe6510b5d6349a8999b83ef7c5671e5a561b803a
Merge git://git./linux/kernel/git/herbert/crypto

Merge crypto to resolve conflict in crypto/Kconfig.