From: Mark Brown <broonie@linaro.org>
Date: Tue, 5 Aug 2014 17:29:18 +0000 (+0100)
Subject: Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500... 
X-Git-Tag: v3.17-rc1~113^2~5
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=862f9f840d32d7656dd7d25dc5c3c67b8244b3e0

Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500', 'regulator/topic/act8865', 'regulator/topic/as3722' and 'regulator/topic/bcm590xx' into regulator-next
---

862f9f840d32d7656dd7d25dc5c3c67b8244b3e0
diff --cc drivers/regulator/bcm590xx-regulator.c
index 58ece59367ae,57544e254a78,57544e254a78,57544e254a78,57544e254a78,6ac27701ff83..5d1fd6f3d10a
--- a/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 {