From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 4 Jul 2011 15:54:40 +0000 (-0700)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1025
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=469bb638dc2a6ea87ea56256f25cc964deb3cf2b;p=firefly-linux-kernel-4.4.55.git

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

469bb638dc2a6ea87ea56256f25cc964deb3cf2b