From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 23 Jun 2011 19:10:28 +0000 (+0100)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1037
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ae4e9b99682adfe9ae170ed593f26fe89eb65b5;p=firefly-linux-kernel-4.4.55.git

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

1ae4e9b99682adfe9ae170ed593f26fe89eb65b5