Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Sep 2011 15:25:23 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Sep 2011 15:25:23 +0000 (08:25 -0700)
commit4d7b5a116f9c08719d98f81e21c7d47f672bdb69
treef9decb477b1715514e059627c4f14eb4526f394d
parentb79c4f75e4d3fbfd225660c12f29a7fafcd8e6d9
parent58d84c4ee0389ddeb86238d5d8359a982c9f7a5b
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix ->write_inode return values
  xfs: fix xfs_mark_inode_dirty during umount
  xfs: deprecate the nodelaylog mount option