Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc drivers/gpio/gpiolib.c
Simple merge

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

diff --cc drivers/regulator/core.c
index 79cb090ff22f61838c33bc113eab5dbb09518488,6e146102fd938b9cee6a34e52511f1819bed76f1..ae0a559d197831403cd25a71706b5002ea1ba1b8
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -1342,25 -1156,8 +1342,14 @@@ static int set_machine_constraints(stru
                        rdev_err(rdev, "failed to set initial mode: %d\n", ret);
                        return ret;
                }
 +      } else if (rdev->constraints->system_load) {
 +              /*
 +               * We'll only apply the initial system load if an
 +               * initial mode wasn't specified.
 +               */
 +              drms_uA_update(rdev);
        }
  
-       /* If the constraints say the regulator should be on at this point
-        * and we have control then make sure it is enabled.
-        */
-       if (rdev->constraints->always_on || rdev->constraints->boot_on) {
-               ret = _regulator_do_enable(rdev);
-               if (ret < 0 && ret != -EINVAL) {
-                       rdev_err(rdev, "failed to enable\n");
-                       return ret;
-               }
-       }
- 
        if ((rdev->constraints->ramp_delay || rdev->constraints->ramp_disable)
                && ops->set_ramp_delay) {
                ret = ops->set_ramp_delay(rdev, rdev->constraints->ramp_delay);