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

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

47cb55a99bf8c72c85be3700ed8fe4e1dd495fa4