diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-29 17:48:37 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2013-02-06 18:04:05 -0500 |
commit | cc883afcc02e1c9c8ab64d20f0288355b857f966 (patch) | |
tree | f938346d1f35d738e9c77671a2e6c9a05cdf7c60 /MAINTAINERS | |
parent | b6fca72536fb94098acb23c00b4e65d3bc4bb252 (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>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fa309ab7ccbf..0526e212bed0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6768,7 +6768,8 @@ S: Supported | |||
6768 | F: drivers/net/ethernet/sfc/ | 6768 | F: drivers/net/ethernet/sfc/ |
6769 | 6769 | ||
6770 | SGI GRU DRIVER | 6770 | SGI GRU DRIVER |
6771 | M: Jack Steiner <steiner@sgi.com> | 6771 | M: Dimitri Sivanich <sivanich@sgi.com> |
6772 | M: Robin Holt <holt@sgi.com> | ||
6772 | S: Maintained | 6773 | S: Maintained |
6773 | F: drivers/misc/sgi-gru/ | 6774 | F: drivers/misc/sgi-gru/ |
6774 | 6775 | ||
@@ -6963,14 +6964,6 @@ L: linux-fbdev@vger.kernel.org | |||
6963 | S: Maintained | 6964 | S: Maintained |
6964 | F: drivers/video/smscufx.c | 6965 | F: drivers/video/smscufx.c |
6965 | 6966 | ||
6966 | SN-IA64 (Itanium) SUB-PLATFORM | ||
6967 | M: Jes Sorensen <jes@sgi.com> | ||
6968 | L: linux-altix@sgi.com | ||
6969 | L: linux-ia64@vger.kernel.org | ||
6970 | W: http://www.sgi.com/altix | ||
6971 | S: Maintained | ||
6972 | F: arch/ia64/sn/ | ||
6973 | |||
6974 | SOC-CAMERA V4L2 SUBSYSTEM | 6967 | SOC-CAMERA V4L2 SUBSYSTEM |
6975 | M: Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 6968 | M: Guennadi Liakhovetski <g.liakhovetski@gmx.de> |
6976 | L: linux-media@vger.kernel.org | 6969 | L: linux-media@vger.kernel.org |