Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 into for-linus

2007-06-19 15:06:15 +10:00 · 2007-06-19 15:06:15 +10:00 · 6a91d25c02
--- a/2
+++ b/2
@ -4022,7 +4022,7 @@ S:	Supported
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
-P:	Tim Shimmin, David Chatterton
+P:	Tim Shimmin
 M:	xfs-masters@oss.sgi.com
 L:	xfs@oss.sgi.com
 W:	http://oss.sgi.com/projects/xfs