Merge git://oss.sgi.com:8090/oss/git/rc-fixes-xfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:28:26 +0000 (16:28 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:28:26 +0000 (16:28 -0800)

Trivial merge