tree 30c0ea313fc55a3091a40893b77600b8f3daf63f
parent 502adf5778f4151dcba3f64dd6ed322151f3712c
parent b5420f235953448eeae615b3361584dc5e414f34
author Linus Torvalds <torvalds@linux-foundation.org> 1282750747 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1282750747 -0700

Merge branch '2.6.36-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev

* '2.6.36-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
  xfs: do not discard page cache data on EAGAIN
  xfs: don't do memory allocation under the CIL context lock
  xfs: Reduce log force overhead for delayed logging
  xfs: dummy transactions should not dirty VFS state
  xfs: ensure f_ffree returned by statfs() is non-negative
  xfs: handle negative wbc->nr_to_write during sync writeback
  writeback: write_cache_pages doesn't terminate at nr_to_write <= 0
  xfs: fix untrusted inode number lookup
  xfs: ensure we mark all inodes in a freed cluster XFS_ISTALE
  xfs: unlock items before allowing the CIL to commit