From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Jun 2007 23:15:01 +0000 (-0700)
Subject: Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.22-rc5~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e871e3c268a26c35ad805196a01d84a55bb755c6;p=linux-2.6-omap-h63xx.git

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

e871e3c268a26c35ad805196a01d84a55bb755c6