aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS10
1 files changed, 4 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2bbe40ea4d10..98f4d897a9f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1681,8 +1681,7 @@ S: Maintained
1681HARMONY SOUND DRIVER 1681HARMONY SOUND DRIVER
1682P: Kyle McMartin 1682P: Kyle McMartin
1683M: kyle@parisc-linux.org 1683M: kyle@parisc-linux.org
1684W: http://www.parisc-linux.org/~kyle/harmony/ 1684L: linux-parisc@vger.kernel.org
1685L: parisc-linux@lists.parisc-linux.org
1686S: Maintained 1685S: Maintained
1687 1686
1688HAYES ESP SERIAL DRIVER 1687HAYES ESP SERIAL DRIVER
@@ -2897,16 +2896,15 @@ W: http://www.torque.net/linux-pp.html
2897S: Maintained 2896S: Maintained
2898 2897
2899PARISC ARCHITECTURE 2898PARISC ARCHITECTURE
2899P: Kyle McMartin
2900M: kyle@parisc-linux.org
2900P: Matthew Wilcox 2901P: Matthew Wilcox
2901M: matthew@wil.cx 2902M: matthew@wil.cx
2902P: Grant Grundler 2903P: Grant Grundler
2903M: grundler@parisc-linux.org 2904M: grundler@parisc-linux.org
2904P: Kyle McMartin 2905L: linux-parisc@vger.kernel.org
2905M: kyle@parisc-linux.org
2906L: parisc-linux@parisc-linux.org
2907W: http://www.parisc-linux.org/ 2906W: http://www.parisc-linux.org/
2908T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git 2907T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
2909T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
2910S: Maintained 2908S: Maintained
2911 2909
2912PARAVIRT_OPS INTERFACE 2910PARAVIRT_OPS INTERFACE