X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=MAINTAINERS;h=25cd7073a20bbedc0094630b575ffc90edab8e51;hb=7ceb932f489e86b555258e5f7d7f061f9c1863eb;hp=21116cc3b4a5bbb81ad4a426f04d382de439f5f0;hpb=ed0da6fc9d3096f54c4a76737eeae57ac81418cf;p=linux-2.6-omap-h63xx.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 21116cc3b4a..25cd7073a20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -889,6 +889,12 @@ M:	rdunlap@xenotime.net
 T:	git http://tali.admingilde.org/git/linux-docbook.git
 S:	Maintained
 
+DOCKING STATION DRIVER
+P:	Kristen Carlson Accardi
+M:	kristen.c.accardi@intel.com
+L:	linux-acpi@vger.kernel.org
+S:	Maintained
+
 DOUBLETALK DRIVER
 P:	James R. Van Zandt
 M:	jrv@vanzandt.mv.com
@@ -3290,10 +3296,11 @@ S:	Maintained
 
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
+P:	Tim Shimmin, David Chatterton
 M:	xfs-masters@oss.sgi.com
-M:	nathans@sgi.com
 L:	xfs@oss.sgi.com
 W:	http://oss.sgi.com/projects/xfs
+T:	git git://oss.sgi.com:8090/xfs/xfs-2.6
 S:	Supported
 
 X86 3-LEVEL PAGING (PAE) SUPPORT