Merge remote-tracking branches 'regulator/topic/const', 'regulator/topic/lm363x'...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/core.c
index 09af2aa,73b7683,73b7683,732ac71,73b7683..4753f5f
--- 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
+++ b/drivers/regulator/core.c
@@@@@@ -138,10 -138,18 -138,18 -146,10 -138,18 +146,10 @@@@@@ static inline struct regulator_dev *rde
      */
     static void regulator_lock_supply(struct regulator_dev *rdev)
     {
 -- -   struct regulator *supply;
 -- -   int i = 0;
 -- -
 -- -   while (1) {
 -- -           mutex_lock_nested(&rdev->mutex, i++);
 -- -           supply = rdev->supply;
 -- -
 -- -           if (!rdev->supply)
 -- -                   return;
 ++ +   int i;
     
-       for (i = 0; rdev->supply; rdev = rdev->supply->rdev, i++)
 -- -           rdev = supply->rdev;
 -- -   }
+++ +   for (i = 0; rdev; rdev = rdev_get_supply(rdev), i++)
 ++ +           mutex_lock_nested(&rdev->mutex, i);
     }
     
     /**