Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

Conflicts:
	drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)

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

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

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

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

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

diff --cc drivers/regulator/wm831x-dcdc.c
Simple merge

diff --cc drivers/regulator/wm831x-ldo.c
Simple merge

diff --cc drivers/regulator/wm8994-regulator.c
index e07972fbf44faeb42c4f5e4f2c165768d66b02eb,f2912f1528ccc1ef7477f1b7fca55e39d48e8b72..7c64ce599d2a956a656cff9aa39ce0f10781aa1d
--- 1/drivers/regulator/wm8994-regulator.c
--- 2/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@@ -191,17 -233,9 +191,10 @@@ static __devinit int wm8994_ldo_probe(s
        } else
                ldo->is_enabled = true;
  
-       config.dev = &pdev->dev;
+       config.dev = wm8994->dev;
        config.init_data = pdata->ldo[id].init_data;
        config.driver_data = ldo;
 +      config.regmap = wm8994->regmap;
  
        ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config);
        if (IS_ERR(ldo->regulator)) {

diff --cc include/linux/i2c/twl.h
Simple merge