tree bbb489e09122106e6d6eb5b76b936a8a0a04be53
parent 1c1ec9c03efce5853f75e244ff368339767f7b9e
parent f1d486a3617a2f620b31224e4ace1496c4627e39
author Linus Torvalds <torvalds@linux-foundation.org> 1271527076 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1271527076 -0700

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: don't warn on EAGAIN in inode reclaim
  xfs: ensure that sync updates the log tail correctly