From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 29 Jun 2011 16:49:04 +0000 (-0700)
Subject: Merge branch 'for-3.0' into for-3.1
X-Git-Tag: firefly_0821_release~3680^2~2691^2~1029
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=57cc2432e172b191db488ec8ad430b283807af0a;p=firefly-linux-kernel-4.4.55.git

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

57cc2432e172b191db488ec8ad430b283807af0a