Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3bab239e82fe5f50427ee59eba95bd6dfe9346c2..25cd7073a20bbedc0094630b575ffc90edab8e51 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3296,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