From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2011 05:06:39 +0000 (+1200)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.1-rc10~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=480082968a78151e731ebd304eeb6cada61a1cd1;p=linux.git

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
---

480082968a78151e731ebd304eeb6cada61a1cd1