Merge tag 'v3.4-rc2' into regulator-drivers

Linux 3.4-rc2 contains some fixes that further patches depend upon.

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

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

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

diff --cc drivers/regulator/tps6586x-regulator.c
index deb855c41e16f5d123aae465cefad28450cbbaba,cfc1f16f777125152678dfbdef3402d28e80c1cd..9a4029a446d3cb516c63b27a05917c62137ed35e
--- 1/drivers/regulator/tps6586x-regulator.c
--- 2/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@@ -75,9 -75,15 +75,14 @@@ static inline struct device *to_tps6586
        return rdev_get_dev(rdev)->parent->parent;
  }
  
 -static int tps6586x_ldo_list_voltage(struct regulator_dev *rdev,
 -                                   unsigned selector)
 +static int tps6586x_list_voltage(struct regulator_dev *rdev, unsigned selector)
  {
        struct tps6586x_regulator *info = rdev_get_drvdata(rdev);
+       int rid = rdev_get_id(rdev);
+ 
+       /* LDO0 has minimal voltage 1.2V rather than 1.25V */
+       if ((rid == TPS6586X_ID_LDO_0) && (selector == 0))
+               return (info->voltages[0] - 50) * 1000;
  
        return info->voltages[selector] * 1000;
  }

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

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

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

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