From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 7 Jul 2011 16:54:19 +0000 (-0700)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1016
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b5d5f59be2ac586db2db0ac324215a714961f364;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.0' into for-3.1
---

b5d5f59be2ac586db2db0ac324215a714961f364