Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
Linus Torvalds [Wed, 1 Feb 2006 03:30:48 +0000 (19:30 -0800)]

Trivial merge