tree b89ceba977943e58475e28cf6acd6377a8d84320
parent 91fe7d7cdd7ebb0b6c01f201a23824ab5b466ada
parent b394e43e995d08821588a22561c6a71a63b4ff27
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227213 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1190227213 -0700

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] Avoid replaying inode buffer initialisation log items if on-disk version is newer.
  [XFS] Ensure file size updates have been completed before writing inode to disk.
  [XFS] On-demand reaping of the MRU cache