| commit | 4699d4423c07a1db35ea9453eac3a07e818338f9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 27 09:01:29 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 27 09:01:29 2011 -0700 |
| tree | a16641f1a1ef5d4a03122d58a1a4ff6514d21b4f | |
| parent | 375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf [diff] | |
| parent | 4a33821236f2ef3af0081e8a5eec1301cbed3125 [diff] |
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