]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:01:29 +0000 (09:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:01:29 +0000 (09:01 -0700)
commita0a422bbdb93f99f9fe238c1d97a2dd22a656fb3
treea16641f1a1ef5d4a03122d58a1a4ff6514d21b4f
parentfd5f6a916877e6e9beb1ffd47ddfa655c6f37289
parent85c067075324847902d80801182b37b647fbd465
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