Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
commit4699d4423c07a1db35ea9453eac3a07e818338f9
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:01:29 +0000 (27 09:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:01:29 +0000 (27 09:01 -0700)
treea16641f1a1ef5d4a03122d58a1a4ff6514d21b4f
parent375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf
parent4a33821236f2ef3af0081e8a5eec1301cbed3125
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: prevent bogus assert when trying to remove non-existent attribute
  xfs: clear XFS_IDIRTY_RELEASE on truncate down
  xfs: reset inode per-lifetime state when recycling it