Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Apr 2010 17:57:56 +0000 (10:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Apr 2010 17:57:56 +0000 (10:57 -0700)
commit65832940eb74dca5ef1c8df086540825a00ad0c8
treebbb489e09122106e6d6eb5b76b936a8a0a04be53
parent1c1ec9c03efce5853f75e244ff368339767f7b9e
parentf1d486a3617a2f620b31224e4ace1496c4627e39
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