From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2011 16:01:29 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4699d4423c07a1db35ea9453eac3a07e818338f9;p=linux-beck.git

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
---

4699d4423c07a1db35ea9453eac3a07e818338f9