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

Linux 3.5-rc5 collides with further development.

Conflicts:
	drivers/regulator/tps65023-regulator.c

diff --cc drivers/regulator/palmas-regulator.c
index 6c485116dd2a5ecb44e1feb5db5eca660dd55947,795f75a6ac3342537a18600e2d0414b1f011caaf..7540c95321cee89e641d1c2ae9a5d2bb8c0011d9
--- 1/drivers/regulator/palmas-regulator.c
--- 2/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@@ -667,14 -673,10 +667,16 @@@ static __devinit int palmas_probe(struc
                        pmic->desc[id].ops = &palmas_ops_smps10;
                        pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
                        pmic->desc[id].vsel_mask = SMPS10_VSEL;
-                       pmic->desc[id].enable_reg = PALMAS_SMPS10_STATUS;
+                       pmic->desc[id].enable_reg =
+                                       PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE,
+                                                       PALMAS_SMPS10_STATUS);
                        pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
 +                      pmic->desc[id].min_uV = 3750000;
 +                      pmic->desc[id].uV_step = 1250000;
 +                      break;
 +              default:
 +                      pmic->desc[id].ops = &palmas_ops_smps;
 +                      pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;
                }
  
                pmic->desc[id].type = REGULATOR_VOLTAGE;