Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 25 Nov 2005 17:33:53 +0000 (09:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 25 Nov 2005 17:33:53 +0000 (09:33 -0800)

Trivial merge