From: Herbert Xu <herbert@gondor.apana.org.au>
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: firefly_0821_release~176^2~5645^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02c0241b600e4ab8a732c89749e252165145d60c;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/herbert/crypto

Merge crypto to resolve conflict in crypto/Kconfig.
---

02c0241b600e4ab8a732c89749e252165145d60c