Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/hch/xfs-2.6
Linus Torvalds [Fri, 27 May 2005 16:26:10 +0000 (09:26 -0700)]

Trivial merge