Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Jul 2010 15:06:40 +0000 (08:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Jul 2010 15:06:40 +0000 (08:06 -0700)
commitc77e9e68269bf50573ce130b5d95ff6e539dbcf8
tree99edc1b070717e18f5958f934bc3921cfed2ce1f
parent31016e9941be85e8c487b1f3c45d253eda356715
parent83ba7b071f30f7c01f72518ad72d5cd203c27502
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  writeback: simplify the write back thread queue
  writeback: split writeback_inodes_wb
  writeback: remove writeback_inodes_wbc
  fs-writeback: fix kernel-doc warnings
  splice: check f_mode for seekable file
  splice: direct_splice_actor() should not use pos in sd