summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-01-29 15:48:37 -0700
committerTony Luck <tony.luck@intel.com>2013-02-06 15:04:05 -0800
commitcc883afcc02e1c9c8ab64d20f0288355b857f966 (patch)
treef938346d1f35d738e9c77671a2e6c9a05cdf7c60
parentb6fca72536fb94098acb23c00b4e65d3bc4bb252 (diff)
MAINTAINERS: update SGI & ia64 Altix stuff
Dimitri and Robin have taken over GRU maintenance. Linux on Altix is no longer maintained except as part of ia64, and there's already a separate IA64 maintainer entry. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--MAINTAINERS11
1 files changed, 2 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fa309ab7ccb..0526e212bed 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6768,7 +6768,8 @@ S: Supported
F: drivers/net/ethernet/sfc/
SGI GRU DRIVER
-M: Jack Steiner <steiner@sgi.com>
+M: Dimitri Sivanich <sivanich@sgi.com>
+M: Robin Holt <holt@sgi.com>
S: Maintained
F: drivers/misc/sgi-gru/
@@ -6963,14 +6964,6 @@ L: linux-fbdev@vger.kernel.org
S: Maintained
F: drivers/video/smscufx.c
-SN-IA64 (Itanium) SUB-PLATFORM
-M: Jes Sorensen <jes@sgi.com>
-L: linux-altix@sgi.com
-L: linux-ia64@vger.kernel.org
-W: http://www.sgi.com/altix
-S: Maintained
-F: arch/ia64/sn/
-
SOC-CAMERA V4L2 SUBSYSTEM
M: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
L: linux-media@vger.kernel.org