Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 12 May 2012 10:10:25 +0000 (11:10 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 12 May 2012 10:10:25 +0000 (11:10 +0100)
commit5949a7e9ab2db04edaeee7c368eb4c99131f4629
tree13e8da5dc42cc62b9721659c41045d2c27c31cc3
parent178e43aef2979525d7864daefd9499614e13800e
parent411a2df5090ccb88f4c3726e4951ebed579fec11
Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

Conflicts:
drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
drivers/regulator/da9052-regulator.c
drivers/regulator/rc5t583-regulator.c
drivers/regulator/tps65023-regulator.c
drivers/regulator/tps65090-regulator.c
drivers/regulator/tps65910-regulator.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
drivers/regulator/wm8994-regulator.c
include/linux/i2c/twl.h