aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 11:07:54 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 11:07:54 -0700
commit2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (patch)
tree9b7fa103dfb222f809bf277668d9ac0636c060ee /MAINTAINERS
parent4e7c6816d680d1945916db047a47847afe4b9b02 (diff)
parentfffcc150a21853651ea890a605832c5cccbb6279 (diff)
downloadmrst-s0i3-test-2e3e80c2b75e3815a0160cbd23d4fdb767d66b35.tar.gz
mrst-s0i3-test-2e3e80c2b75e3815a0160cbd23d4fdb767d66b35.tar.xz
mrst-s0i3-test-2e3e80c2b75e3815a0160cbd23d4fdb767d66b35.zip
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b8483334de..97bc927d2c5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1023,8 +1023,8 @@ W: http://www.ia64-linux.org/
S: Maintained
SN-IA64 (Itanium) SUB-PLATFORM
-P: Jesse Barnes
-M: jbarnes@sgi.com
+P: Greg Edwards
+M: edwardsg@sgi.com
L: linux-altix@sgi.com
L: linux-ia64@vger.kernel.org
W: http://www.sgi.com/altix