Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
commite871e3c268a26c35ad805196a01d84a55bb755c6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 23:15:01 +0000 (15 16:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 23:15:01 +0000 (15 16:15 -0700)
tree9189cae935058c46e158cb3a11342b6da9374b9f
parent3ea88d6738ebda95e05ada0c7b72f224d0a36953
parent02676e5aee271c1f20d7d44249d26741aef1e846
Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block

* 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block:
  splice: only check do_wakeup in splice_to_pipe() for a real pipe
  splice: fix leak of pages on short splice to pipe
  splice: adjust balance_dirty_pages_ratelimited() call