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

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

diff --cc drivers/regulator/anatop-regulator.c
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/regulator/palmas-regulator.c
Simple merge

diff --cc drivers/regulator/s5m8767.c
Simple merge