From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 3 Dec 2011 11:07:43 +0000 (+0000)
Subject: Merge branch 'for-3.2' into for-3.3
X-Git-Tag: firefly_0821_release~3680^2~2691^2~325
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=672b0c6a37d3bf951a449cff9f6c98b7dfc47a16;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.2' into for-3.3
---

672b0c6a37d3bf951a449cff9f6c98b7dfc47a16