From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 6 Jun 2011 11:47:06 +0000 (+0100)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1105
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.0' into for-3.1
---

84abd1b395cf41269ffb5605a6ece3d6d7f8a3e1