Merge branches 'regulator-linus' and 'regulator-drivers' into regulator-next

diff --cc drivers/regulator/max8997.c
index db09244bb3edb2305d8765cffd270ba5f5a00586,17a58c56eebfb4f0c7978afa9b04d2307ccc342e,ec99bd30e603ff839bb8fbbf4675df07ccdf7d39..99d7cb33d616753727a3d07981bbe272435d4954
--- 1/drivers/regulator/max8997.c
--- 2/drivers/regulator/max8997.c
--- 3/drivers/regulator/max8997.c
+++ b/drivers/regulator/max8997.c
@@@@ -848,14 -850,14 -888,14 +888,14 @@@@ static struct regulator_ops max8997_cha
   
   static struct regulator_ops max8997_charger_fixedstate_ops = {
        .is_enabled             = max8997_reg_is_enabled,
--      .get_current_limit      = max8997_get_voltage,
--      .set_current_limit      = max8997_set_voltage_ldobuck_wrap,
++      .get_current_limit      = max8997_get_current_limit,
++      .set_current_limit      = max8997_set_current_limit,
   };
   
 - #define regulator_desc_ldo(num)              {       \
 -      .name           = "LDO"#num,            \
 -      .id             = MAX8997_LDO##num,     \
 -      .ops            = &max8997_ldo_ops,     \
 + #define MAX8997_VOLTAGE_REGULATOR(_name, _ops) {\
 +      .name           = #_name,               \
 +      .id             = MAX8997_##_name,      \
 +      .ops            = &_ops,                \
        .type           = REGULATOR_VOLTAGE,    \
        .owner          = THIS_MODULE,          \
   }