Merge tag 'v3.5-rc5' into regulator-drivers
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jul 2012 17:24:59 +0000 (18:24 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 2 Jul 2012 17:24:59 +0000 (18:24 +0100)
commit744c62eb65a1c3bb2196ded1a1d2922cf6f2ce80
treee7c47e2e9aa8f6184cb5b20bde2e4fda96a3bb59
parentf141822b15635daa94610c5527806fa315f59f4d
parent6887a4131da3adaab011613776d865f4bcfb5678
Merge tag 'v3.5-rc5' into regulator-drivers

Linux 3.5-rc5 collides with further development.

Conflicts:
drivers/regulator/tps65023-regulator.c
drivers/regulator/palmas-regulator.c