projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
95bc156
0030807
)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
author
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 14 Oct 2011 05:06:39 +0000
(17:06 +1200)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Fri, 14 Oct 2011 05:06:39 +0000
(17:06 +1200)
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: revert to using a kthread for AIL pushing
xfs: force the log if we encounter pinned buffers in .iop_pushbuf
xfs: do not update xa_last_pushed_lsn for locked items
Trivial merge