From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Dec 2010 17:13:36 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: android-x86-2.2-r2~1362
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8cb280c90f9cfaab3ba3afbace0b1711dee80d0c;p=android-x86%2Fkernel.git

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: only run xfs_error_test if error injection is active
  xfs: avoid moving stale inodes in the AIL
  xfs: delayed alloc blocks beyond EOF are valid after writeback
  xfs: push stale, pinned buffers on trylock failures
  xfs: fix failed write truncation handling.
---

8cb280c90f9cfaab3ba3afbace0b1711dee80d0c