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

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

b21a415d78201bd10f99ea995e757eec5d344e48