tree 37b3f593288fd9f8fd97f60a84bd57fef8c0d87a
parent 79ecb043ea0ae046463f03dea46c5e13a9312205
parent fd45e4784164d1017521086524e3442318c67370
author Linus Torvalds <torvalds@linux-foundation.org> 1263232128 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1263232128 -0800

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: Ensure we force all busy extents in range to disk
  xfs: Don't flush stale inodes
  xfs: fix timestamp handling in xfs_setattr
  xfs: use DECLARE_EVENT_CLASS