| commit | 480082968a78151e731ebd304eeb6cada61a1cd1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 14 17:06:39 2011 +1200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 14 17:06:39 2011 +1200 |
| tree | 263179c267b99763cb4fd952b24870cca28d14a7 | |
| parent | 95bc156c62a57cda1b225e03ae23eb2764ee1046 [diff] | |
| parent | 0030807c66f058230bcb20d2573bcaf28852e804 [diff] |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * '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