Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 29 Feb 2008 16:40:21 +0000 (08:40 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 29 Feb 2008 16:40:21 +0000 (08:40 -0800)
commit3cf9460a999480f444d1b96f09b0640f52b1537e
tree19b237526c2fb9ad82f5e8349ea765273d9b44f3
parent57ce36feb4d1281247755bc445bae77728298955
parent1bd960ee2b1231759bd485aad0fa483c2f793a3b
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

* 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6:
  [XFS] If you mount an XFS filesystem with no mount options at all, then