Merge branch 'i2c/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 33d77794a1f2289c64418bbed0ab2ba8bd49ac0d..255655880881cd22df8f0c5ff53f76e72691d1f2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2908,6 +2908,14 @@ S:       Maintained
 F:     drivers/iio/light/cm*
 F:     Documentation/devicetree/bindings/i2c/trivial-devices.txt
 
+CAVIUM I2C DRIVER
+M:     Jan Glauber <jglauber@cavium.com>
+M:     David Daney <david.daney@cavium.com>
+W:     http://www.cavium.com
+S:     Supported
+F:     drivers/i2c/busses/i2c-octeon*
+F:     drivers/i2c/busses/i2c-thunderx*
+
 CAVIUM LIQUIDIO NETWORK DRIVER
 M:     Derek Chickles <derek.chickles@caviumnetworks.com>
 M:     Satanand Burla <satananda.burla@caviumnetworks.com>
@@ -5788,6 +5796,8 @@ S:        Maintained
 F:     Documentation/i2c/i2c-topology
 F:     Documentation/i2c/muxes/
 F:     Documentation/devicetree/bindings/i2c/i2c-mux*
+F:     Documentation/devicetree/bindings/i2c/i2c-arb*
+F:     Documentation/devicetree/bindings/i2c/i2c-gate*
 F:     drivers/i2c/i2c-mux.c
 F:     drivers/i2c/muxes/
 F:     include/linux/i2c-mux.h