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

Trivial merge