tree d09fb1504fa650200e761a54f6ebc05a4a60623b
parent 1cac8e884fbea0b10ee5692cd97e456b58c34ce5
parent be4f1ac828776bbc7868a68b465cd8eedb733cfd
author Linus Torvalds <torvalds@linux-foundation.org> 1325207145 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325207145 -0800

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: log all dirty inodes in xfs_fs_sync_fs
  xfs: log the inode in ->write_inode calls for kupdate