diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /MAINTAINERS | |
parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 251a28e2d4cc..e88d193d42f8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1643,7 +1643,7 @@ S: Maintained | |||
1643 | MIPS | 1643 | MIPS |
1644 | P: Ralf Baechle | 1644 | P: Ralf Baechle |
1645 | M: ralf@linux-mips.org | 1645 | M: ralf@linux-mips.org |
1646 | W: http://oss.sgi.com/mips/mips-howto.html | 1646 | W: http://www.linux-mips.org/ |
1647 | L: linux-mips@linux-mips.org | 1647 | L: linux-mips@linux-mips.org |
1648 | S: Maintained | 1648 | S: Maintained |
1649 | 1649 | ||