Merge tag 'v3.5-rc4' into regulator-drivers
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 25 Jun 2012 09:11:40 +0000 (10:11 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 25 Jun 2012 09:11:40 +0000 (10:11 +0100)
Linux 3.5-rc4 contains patches which conflict with some of the
development work.


Trivial merge