Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500...

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

diff --cc drivers/regulator/bcm590xx-regulator.c
index 58ece59367ae4884511ff6f085362afc7905d811,57544e254a7864ea5afd8e994205726bb28b3d1b,57544e254a7864ea5afd8e994205726bb28b3d1b,57544e254a7864ea5afd8e994205726bb28b3d1b,57544e254a7864ea5afd8e994205726bb28b3d1b,6ac27701ff8350d843154845f6c4a41a0f2c5657..5d1fd6f3d10ad9ac70f9a2bcb4b6824db086c297
--- 1/drivers/regulator/bcm590xx-regulator.c
--- 2/drivers/regulator/bcm590xx-regulator.c
--- 3/drivers/regulator/bcm590xx-regulator.c
--- 4/drivers/regulator/bcm590xx-regulator.c
--- 5/drivers/regulator/bcm590xx-regulator.c
--- 6/drivers/regulator/bcm590xx-regulator.c
+++ b/drivers/regulator/bcm590xx-regulator.c
@@@@@@@ -190,13 -186,12 -186,12 -186,12 -186,12 -149,6 +190,13 @@@@@@@ static struct bcm590xx_info bcm590xx_re
        BCM590XX_REG_RANGES(sdsr1, dcdc_sdsr1_ranges),
        BCM590XX_REG_RANGES(sdsr2, dcdc_iosr1_ranges),
        BCM590XX_REG_RANGES(vsr, dcdc_iosr1_ranges),
     +  BCM590XX_REG_TABLE(gpldo1, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo2, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo3, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo4, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo5, ldo_a_table),
     +  BCM590XX_REG_TABLE(gpldo6, ldo_a_table),
 +++++  BCM590XX_REG_TABLE(vbus, ldo_vbus),
      };
      
      struct bcm590xx_reg {