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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/busses/Kconfig
index 88f5f5f55bc53cc43ab59e3e8fbb414bf8ab53c3,96c6d82da3edc839bd75e1f25d44fc45a764270c..7b591ee4dbd97fdbb705924a515a620f55e88483
--- 1/drivers/i2c/busses/Kconfig
--- 2/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@@ -725,9 -715,19 +716,19 @@@ config I2C_VERSATIL
          This driver can also be built as a module.  If so, the module
          will be called i2c-versatile.
  
+ config I2C_WMT
+       tristate "Wondermedia WM8xxx SoC I2C bus support"
+       depends on ARCH_VT8500
+       help
+         Say yes if you want to support the I2C bus on Wondermedia 8xxx-series
+         SoCs.
+ 
+         This driver can also be built as a module. If so, the module will be
+         called i2c-wmt.
+ 
  config I2C_OCTEON
        tristate "Cavium OCTEON I2C bus support"
 -      depends on CPU_CAVIUM_OCTEON
 +      depends on CAVIUM_OCTEON_SOC
        help
          Say yes if you want to support the I2C serial bus on Cavium
          OCTEON SOC.