Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 03:48:07 +0000 (19:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 03:48:07 +0000 (19:48 -0800)

Trivial merge