From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 24 Aug 2011 19:22:43 +0000 (+0100)
Subject: Merge branch 'for-3.1' into for-3.2
X-Git-Tag: firefly_0821_release~3680^2~2691^2~888
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b42af319f26bcb7d84b42b4bd0ca3b84ba94b160;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.1' into for-3.2
---

b42af319f26bcb7d84b42b4bd0ca3b84ba94b160