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

[deliverable/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9daba0d4755232013ed97451e301b4232ba4fb78..9b0bbbef32a8ad52e3b3204810e6aa3948b53670 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2891,6 +2891,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>
@@ -5680,6 +5688,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