summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-18 11:48:10 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-18 11:48:10 +1000
commit289a797799e6d530046a8f779be2790157033463 (patch)
treee508ca6778da108a2e79c818609b4ac8eff75b0f /MAINTAINERS
parentfb03b09fff21d2c942d52fd755b89cc3c0e1dd82 (diff)
parentffebedb7ab3f7964a70a1771547b26af38a189d2 (diff)
Merge remote branch 'infiniband/for-next'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d9700f00a68e..08f52a3b6bff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1750,6 +1750,20 @@ W: http://www.openfabrics.org
S: Supported
F: drivers/infiniband/hw/cxgb3/
+CXGB4 ETHERNET DRIVER (CXGB4)
+M: Dimitris Michailidis <dm@chelsio.com>
+L: netdev@vger.kernel.org
+W: http://www.chelsio.com
+S: Supported
+F: drivers/net/cxgb4/
+
+CXGB4 IWARP RNIC DRIVER (IW_CXGB4)
+M: Steve Wise <swise@chelsio.com>
+L: linux-rdma@vger.kernel.org
+W: http://www.openfabrics.org
+S: Supported
+F: drivers/infiniband/hw/cxgb4/
+
CYBERPRO FB DRIVER
M: Russell King <linux@arm.linux.org.uk>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)