From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 25 Jun 2012 09:11:40 +0000 (+0100)
Subject: Merge tag 'v3.5-rc4' into regulator-drivers
X-Git-Tag: firefly_0821_release~3680^2~2413^2^2~63
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=85e63343f49cdf859bb630ba39d9a9af85dfb3e6;p=firefly-linux-kernel-4.4.55.git

Merge tag 'v3.5-rc4' into regulator-drivers

Linux 3.5-rc4 contains patches which conflict with some of the
development work.
---

85e63343f49cdf859bb630ba39d9a9af85dfb3e6