Merge remote-tracking branches 'regulator/topic/max8649', 'regulator/topic/mode'...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/core.c
index e607baf,e225711,0e0d829,e225711,e225711,e225711..b899947
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
--- 5/drivers/regulator/core.c
--- 6/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@ -632,9 -632,33 -632,33 -632,33 -632,33 -632,33 +632,9 @@@@@@@ static ssize_t regulator_bypass_show(st
      static DEVICE_ATTR(bypass, 0444,
                   regulator_bypass_show, NULL);
      
 -----/*
 ----- * These are the only attributes are present for all regulators.
 ----- * Other attributes are a function of regulator functionality.
 ----- */
 -----static struct attribute *regulator_dev_attrs[] = {
 -----  &dev_attr_name.attr,
 -----  &dev_attr_num_users.attr,
 -----  &dev_attr_type.attr,
 -----  NULL,
 -----};
 -----ATTRIBUTE_GROUPS(regulator_dev);
 -----
 -----static void regulator_dev_release(struct device *dev)
 -----{
 -----  struct regulator_dev *rdev = dev_get_drvdata(dev);
 -----  kfree(rdev);
 -----}
 -----
 -----static struct class regulator_class = {
 -----  .name = "regulator",
 -----  .dev_release = regulator_dev_release,
 -----  .dev_groups = regulator_dev_groups,
 -----};
 -----
      /* Calculate the new optimum regulator operating mode based on the new total
       * consumer load. All locks held by caller */
-- ---static void drms_uA_update(struct regulator_dev *rdev)
++ +++static int drms_uA_update(struct regulator_dev *rdev)
      {
        struct regulator *sibling;
        int current_uA = 0, output_uV, input_uV, err;

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