Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put', 'regulator...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/core.c
index 5c4829cba6a62de6168c6bb3c4913812e5e8b4e1,aa4d28b5984e9ea6ebd5bd95383e2885a749cfe6,e68754cfadc8e73801b77aec448b09965de8f4f0,5c4829cba6a62de6168c6bb3c4913812e5e8b4e1,5c4829cba6a62de6168c6bb3c4913812e5e8b4e1,5c4829cba6a62de6168c6bb3c4913812e5e8b4e1,5c4829cba6a62de6168c6bb3c4913812e5e8b4e1,5c4829cba6a62de6168c6bb3c4913812e5e8b4e1,f7c74db7465cefa6b375b19ab986f36eda0e7a1c..b4a425a452939cafe8ba87fafe292e958f70ef7b
--- 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
--- 7/drivers/regulator/core.c
--- 8/drivers/regulator/core.c
--- 9/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@@@@ -3447,12 -3447,13 -3447,15 -3447,12 -3447,12 -3447,12 -3447,12 -3447,12 -3452,12 +3452,16 @@@@@@@@@@ scrub
                if (rdev->ena_gpio)
                        gpio_free(rdev->ena_gpio);
                kfree(rdev->constraints);
+ +++++++wash:
                device_unregister(&rdev->dev);
++ ++++++
++ ++++++       mutex_unlock(&regulator_list_mutex);
++ ++++++       if (rdev->supply)
++ ++++++               regulator_put(rdev->supply);
++ ++++++
                /* device core frees rdev */
                rdev = ERR_PTR(ret);
-- ------       goto out;
++ ++++++       return rdev;
         
         clean:
                kfree(rdev);