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)
Merge crypto to resolve conflict in crypto/Kconfig.


Trivial merge