Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 10 Aug 2006 06:57:52 +0000 (23:57 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 10 Aug 2006 06:57:52 +0000 (23:57 -0700)

Trivial merge