Merge remote-tracking branches 'regulator/topic/s2mps11', 'regulator/topic/s2mpu02...

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/regulator/Kconfig
index f5040fc49a3a63aa3df6a5cf665f8462015207ee,203c02d7f2834e3bed8b90b258c56ecf8fe6ded2,789eb46090e3ffe22de72845fe8edf8f32a907d3,789eb46090e3ffe22de72845fe8edf8f32a907d3,789eb46090e3ffe22de72845fe8edf8f32a907d3..2dc8289e5dba772be498e084505c72d89491b3fb
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
--- 3/drivers/regulator/Kconfig
--- 4/drivers/regulator/Kconfig
--- 5/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@@@@ -196,18 -196,8 -196,8 -196,8 -196,8 +196,18 @@@@@@ config REGULATOR_DA921
          Say y here to support for the Dialog Semiconductor DA9210.
          The DA9210 is a multi-phase synchronous step down
          converter 12A DC-DC Buck controlled through an I2C
 +        interface.
 +   
 ++++config REGULATOR_DA9211
 ++++   tristate "Dialog Semiconductor DA9211/DA9212 regulator"
 ++++   depends on I2C
 ++++   select REGMAP_I2C
 ++++   help
 ++++     Say y here to support for the Dialog Semiconductor DA9211/DA9212.
 ++++     The DA9211/DA9212 is a multi-phase synchronous step down
 ++++     converter 12A DC-DC Buck controlled through an I2C
  +++     interface.
  +++
     config REGULATOR_DBX500_PRCMU
        bool