Merge remote-tracking branch 'regulator/for-next'

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc drivers/mfd/tps6586x.c
Simple merge

diff --cc drivers/regulator/Kconfig
index f0cc9e6dac3ac5a3ecd7cd78ea4dd38d5f72d41c,c2fa0b4367b12bafbe820d2fade86af5658196c3..789eb46090e3ffe22de72845fe8edf8f32a907d3
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -265,13 -272,20 +272,21 @@@ config REGULATOR_LP878
        help
          This driver supports LP8788 voltage regulator chip.
  
+ config REGULATOR_LTC3589
+       tristate "LTC3589 8-output voltage regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This enables support for the LTC3589, LTC3589-1, and LTC3589-2
+         8-output regulators controlled via I2C.
+ 
  config REGULATOR_MAX14577
 -      tristate "Maxim 14577 regulator"
 +      tristate "Maxim 14577/77836 regulator"
        depends on MFD_MAX14577
        help
 -        This driver controls a Maxim 14577 regulator via I2C bus.
 -        The regulators include safeout LDO and current regulator 'CHARGER'.
 +        This driver controls a Maxim MAX14577/77836 regulator via I2C bus.
 +        The MAX14577 regulators include safeout LDO and charger current
 +        regulator. The MAX77836 has two additional LDOs.
  
  config REGULATOR_MAX1586
        tristate "Maxim 1586/1587 voltage regulator"

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