Merge tag 'armsoc-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index cc637cd31f3beedf7e3f05041635e662cff892de..32bafda47c2fedacaf2f5b4a71347cc5889dc773 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5270,6 +5270,16 @@ F:       include/linux/hyperv.h
 F:     tools/hv/
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 
+I2C MUXES
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/i2c/muxes/
+F:     Documentation/devicetree/bindings/i2c/i2c-mux*
+F:     drivers/i2c/i2c-mux.c
+F:     drivers/i2c/muxes/
+F:     include/linux/i2c-mux.h
+
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
@@ -5760,6 +5770,16 @@ F:       Documentation/networking/i40evf.txt
 F:     drivers/net/ethernet/intel/
 F:     drivers/net/ethernet/intel/*/
 
+INTEL RDMA RNIC DRIVER
+M:     Faisal Latif <faisal.latif@intel.com>
+R:     Chien Tin Tung <chien.tin.tung@intel.com>
+R:     Mustafa Ismail <mustafa.ismail@intel.com>
+R:     Shiraz Saleem <shiraz.saleem@intel.com>
+R:     Tatyana Nikolova <tatyana.e.nikolova@intel.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/hw/i40iw/
+
 INTEL-MID GPIO DRIVER
 M:     David Cohen <david.a.cohen@linux.intel.com>
 L:     linux-gpio@vger.kernel.org
@@ -9214,6 +9234,12 @@ S:       Supported
 F:     net/rds/
 F:     Documentation/networking/rds.txt
 
+RDMAVT - RDMA verbs software
+M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/sw/rdmavt
+
 READ-COPY UPDATE (RCU)
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 M:     Josh Triplett <josh@joshtriplett.org>
@@ -9676,9 +9702,9 @@ F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
 F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
 
 SYNOPSYS DESIGNWARE I2C DRIVER
-M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
-M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+R:     Mika Westerberg <mika.westerberg@linux.intel.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-designware-*