From: Herbert Xu Date: Fri, 21 Jun 2013 07:13:27 +0000 (+0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto X-Git-Tag: v3.11-rc1~82^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02c0241b600e4ab8a732c89749e252165145d60c;p=thirdparty%2Fkernel%2Flinux.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto Merge crypto to resolve conflict in crypto/Kconfig. --- 02c0241b600e4ab8a732c89749e252165145d60c