aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 15:19:15 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 15:19:15 -0400
commite9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch)
tree318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /MAINTAINERS
parent955c5038823748e529a49f0e33ab635d92843500 (diff)
parent09af7b443c257460d45cb6c1896d29f173fef35b (diff)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
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
1643MIPS 1643MIPS
1644P: Ralf Baechle 1644P: Ralf Baechle
1645M: ralf@linux-mips.org 1645M: ralf@linux-mips.org
1646W: http://oss.sgi.com/mips/mips-howto.html 1646W: http://www.linux-mips.org/
1647L: linux-mips@linux-mips.org 1647L: linux-mips@linux-mips.org
1648S: Maintained 1648S: Maintained
1649 1649