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)
commit85e63343f49cdf859bb630ba39d9a9af85dfb3e6
tree8c72184c38d93a34e08f386ae70b4ee12ed7ac20
parent2f6ae6ef631cd16b0725958ee805a24b9e38d7ad
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc
Merge tag 'v3.5-rc4' into regulator-drivers

Linux 3.5-rc4 contains patches which conflict with some of the
development work.
drivers/regulator/anatop-regulator.c
drivers/regulator/core.c
drivers/regulator/palmas-regulator.c
drivers/regulator/s5m8767.c