From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 10 Nov 2011 12:12:59 +0000 (+0000)
Subject: Merge branch 'for-3.2' into for-3.3
X-Git-Tag: firefly_0821_release~3680^2~2691^2~472
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=515fedfeb6891f465bb1cc1ffe2e94e1b0d195a4;p=firefly-linux-kernel-4.4.55.git

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

515fedfeb6891f465bb1cc1ffe2e94e1b0d195a4