Merge remote-tracking branches 'regulator/topic/max8973', 'regulator/topic/max8997...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

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

diff --cc drivers/regulator/s2mps11.c
index 89966213315cd1e13708e7c0502bdd31d2044ceb,d9e557990577d33029e24e57cb6bf20740ea3ab6,d9e557990577d33029e24e57cb6bf20740ea3ab6,d9e557990577d33029e24e57cb6bf20740ea3ab6,d9e557990577d33029e24e57cb6bf20740ea3ab6,d9e557990577d33029e24e57cb6bf20740ea3ab6,d9e557990577d33029e24e57cb6bf20740ea3ab6,1f6fd4c45006e93e56805ce65e3128c4a87103e5..68fd54702edbf12436fbd5f7b7ebd2a6cb68e7ef
--- 1/drivers/regulator/s2mps11.c
--- 2/drivers/regulator/s2mps11.c
--- 3/drivers/regulator/s2mps11.c
--- 4/drivers/regulator/s2mps11.c
--- 5/drivers/regulator/s2mps11.c
--- 6/drivers/regulator/s2mps11.c
--- 7/drivers/regulator/s2mps11.c
--- 8/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@@@@@@@@ -438,10 -438,9 -438,9 -438,9 -438,9 -438,9 -438,9 -632,12 +632,12 @@@@@@@@@ common_reg
                config.dev = &pdev->dev;
                config.regmap = iodev->regmap_pmic;
                config.driver_data = s2mps11;
-------         for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+++++++         for (i = 0; i < s2mps11->rdev_num; i++) {
+++++++                 struct regulator_dev *regulator;
+++++++ 
                        if (!reg_np) {
                                config.init_data = pdata->regulators[i].initdata;
 ++++++                         config.of_node = pdata->regulators[i].reg_node;
                        } else {
                                config.init_data = rdata[i].init_data;
                                config.of_node = rdata[i].of_node;