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

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

21abbb024fb782f176d7e9ddd3bef8207d024227