Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/arizona-ldo1.c
index 739faf99b9e26b259df9c9623800993d65d09254,b44fa6f0e9476315f3d9562988e687e691a285f9..ed7beec53af85505b49815d97d94947d0d311efb
--- 1/drivers/regulator/arizona-ldo1.c
--- 2/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@@ -180,10 -67,9 +180,10 @@@ static const struct regulator_init_dat
        .num_consumer_supplies = 1,
  };
  
- static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
+ static int arizona_ldo1_probe(struct platform_device *pdev)
  {
        struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
 +      const struct regulator_desc *desc;
        struct regulator_config config = { };
        struct arizona_ldo1 *ldo1;
        int ret;

diff --cc drivers/regulator/arizona-micsupp.c
Simple merge

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

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

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

diff --cc drivers/regulator/wm831x-dcdc.c
Simple merge