summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-06-26 13:28:42 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-06-26 13:28:42 +1000
commitedd726f2b5b837ce1b62988588f5b5ce724aa44b (patch)
treed8365b7021967a06a4f58dc8a57a2320157d8026 /MAINTAINERS
parent9b338f21561da61067f2a767d416ac18db4f16ae (diff)
parent26e1fe24e78d91b53d1628a8b812739a176fc837 (diff)
Merge commit 'trivial/for-next'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 6 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9ee0c144b2bb..d0938982fd74 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3374,7 +3374,7 @@ F: scripts/Makefile.*
KERNEL JANITORS
P: Several
L: kernel-janitors@vger.kernel.org
-W: http://www.kerneljanitors.org/
+W: http://janitor.kernelnewbies.org/
S: Maintained
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
@@ -5810,17 +5810,17 @@ P: Jiri Kosina
M: trivial@kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
S: Maintained
-F: drivers/char/tty_*
-F: drivers/serial/serial_core.c
-F: include/linux/serial_core.h
-F: include/linux/serial.h
-F: include/linux/tty.h
TTY LAYER
P: Alan Cox
M: alan@lxorguk.ukuu.org.uk
S: Maintained
T: stgit http://zeniv.linux.org.uk/~alan/ttydev/
+F: drivers/char/tty_*
+F: drivers/serial/serial_core.c
+F: include/linux/serial_core.h
+F: include/linux/serial.h
+F: include/linux/tty.h
TULIP NETWORK DRIVERS
P: Grant Grundler