From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Tue, 15 May 2012 07:21:26 +0000 (+1000)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: firefly_0821_release~3680^2~2589^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5;p=firefly-linux-kernel-4.4.55.git

Merge git://git./linux/kernel/git/torvalds/linux

Merge mainline to add prerequisite for ARM ux500 crypto support.
---

b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5