diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-31 14:07:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-31 14:07:54 -0400 |
| commit | 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (patch) | |
| tree | 9b7fa103dfb222f809bf277668d9ac0636c060ee /MAINTAINERS | |
| parent | 4e7c6816d680d1945916db047a47847afe4b9b02 (diff) | |
| parent | fffcc150a21853651ea890a605832c5cccbb6279 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5b8483334de1..97bc927d2c55 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1023,8 +1023,8 @@ W: http://www.ia64-linux.org/ | |||
| 1023 | S: Maintained | 1023 | S: Maintained |
| 1024 | 1024 | ||
| 1025 | SN-IA64 (Itanium) SUB-PLATFORM | 1025 | SN-IA64 (Itanium) SUB-PLATFORM |
| 1026 | P: Jesse Barnes | 1026 | P: Greg Edwards |
| 1027 | M: jbarnes@sgi.com | 1027 | M: edwardsg@sgi.com |
| 1028 | L: linux-altix@sgi.com | 1028 | L: linux-altix@sgi.com |
| 1029 | L: linux-ia64@vger.kernel.org | 1029 | L: linux-ia64@vger.kernel.org |
| 1030 | W: http://www.sgi.com/altix | 1030 | W: http://www.sgi.com/altix |