aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-26 06:15:27 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-26 06:15:27 -0400
commit25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (patch)
tree18a2ef934aa353ca695c3faaa3b7497fea22037a /MAINTAINERS
parentfef6108d4556917c45cd9ba397c1c7597f3990e1 (diff)
parent4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff)
downloadkernel_goldelico_gta04-25f73891c3059e9ce6ff0a02670aa98baf6cbce9.zip
kernel_goldelico_gta04-25f73891c3059e9ce6ff0a02670aa98baf6cbce9.tar.gz
kernel_goldelico_gta04-25f73891c3059e9ce6ff0a02670aa98baf6cbce9.tar.bz2
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 61060e8..4e1e817 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2065,8 +2065,12 @@ P: Matthew Wilcox
M: matthew@wil.cx
P: Grant Grundler
M: grundler@parisc-linux.org
+P: Kyle McMartin
+M: kyle@parisc-linux.org
L: parisc-linux@parisc-linux.org
W: http://www.parisc-linux.org/
+T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
+T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
S: Maintained
PCI ERROR RECOVERY