From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 28 May 2015 03:16:41 +0000 (+0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
X-Git-Tag: firefly_0821_release~176^2~1617^2~132
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d7e3d89954af773c70948a54cfa2aaa15907c1c;p=firefly-linux-kernel-4.4.55.git

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

Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
---

6d7e3d89954af773c70948a54cfa2aaa15907c1c