Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 26 insertions, 4 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index f1c6ca7e2852..aa87b6a3bbef 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -211,7 +211,7 @@ config I2C_VIA
           will be called i2c-via.
 
 config I2C_VIAPRO
-        tristate "VIA VT82C596/82C686/82xx and CX700/VX800/VX820"
+        tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx"
         depends on PCI
         help
           If you say yes to this option, support will be included for the VIA
@@ -225,8 +225,8 @@ config I2C_VIAPRO
             VT8237R/A/S
             VT8251
             CX700
-            VX800
-            VX820
+            VX800/VX820
+            VX855/VX875
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-viapro.
@@ -298,7 +298,7 @@ config I2C_BLACKFIN_TWI
 config I2C_BLACKFIN_TWI_CLK_KHZ
         int "Blackfin TWI I2C clock (kHz)"
         depends on I2C_BLACKFIN_TWI
-        range 10 400
+        range 21 400
         default 50
         help
           The unit of the TWI clock is kHz.
@@ -326,6 +326,15 @@ config I2C_DAVINCI
           devices such as DaVinci NIC.
           For details please see http://www.ti.com/davinci
 
+config I2C_DESIGNWARE
+        tristate "Synopsys DesignWare"
+        help
+          If you say yes to this option, support will be included for the
+          Synopsys DesignWare I2C adapter. Only master mode is supported.
+
+          This driver can also be built as a module.  If so, the module
+          will be called i2c-designware.
+
 config I2C_GPIO
         tristate "GPIO-based bitbanging I2C"
         depends on GENERIC_GPIO
@@ -513,6 +522,19 @@ config I2C_SIMTEC
           This driver can also be built as a module. If so, the module
           will be called i2c-simtec.
 
+config I2C_STU300
+        tristate "ST Microelectronics DDC I2C interface"
+        depends on MACH_U300
+        default y if MACH_U300
+        help
+          If you say yes to this option, support will be included for the
+          I2C interface from ST Microelectronics simply called "DDC I2C"
+          supporting both I2C and DDC, used in e.g. the U300 series
+          mobile platforms.
+
+          This driver can also be built as a module. If so, the module
+          will be called i2c-stu300.
+
 config I2C_VERSATILE
         tristate "ARM Versatile/Realview I2C bus support"
         depends on ARCH_VERSATILE || ARCH_REALVIEW