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

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

0a105ddb35aa702d975cb902d8d2c0cde4f1f231