Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 61aeb5a..8c68092 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3350,10 +3350,8 @@ S:       Maintained
 PARISC ARCHITECTURE
 P:     Kyle McMartin
 M:     kyle@mcmartin.ca
-P:     Matthew Wilcox
-M:     matthew@wil.cx
-P:     Grant Grundler
-M:     grundler@parisc-linux.org
+P:     Helge Deller
+M:     deller@gmx.de
 L:     linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
@@ -4878,7 +4876,8 @@ S:        Supported
 
 XFS FILESYSTEM
 P:     Silicon Graphics Inc
-P:     Bill O'Donnell
+P:     Felix Blyakher
+M:     felixb@sgi.com
 M:     xfs-masters@oss.sgi.com
 L:     xfs@oss.sgi.com
 W:     http://oss.sgi.com/projects/xfs