projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
375ac3e
4a33821
)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
author
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:01:29 +0000
(09:01 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Mon, 27 Jun 2011 16:01:29 +0000
(09:01 -0700)
* '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
Trivial merge