tree f9decb477b1715514e059627c4f14eb4526f394d
parent b79c4f75e4d3fbfd225660c12f29a7fafcd8e6d9
parent 58d84c4ee0389ddeb86238d5d8359a982c9f7a5b
author Linus Torvalds <torvalds@linux-foundation.org> 1314977123 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314977123 -0700

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