commit | e871e3c268a26c35ad805196a01d84a55bb755c6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 15 16:15:01 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jun 15 16:15:01 2007 -0700 |
tree | 9189cae935058c46e158cb3a11342b6da9374b9f | |
parent | 3ea88d6738ebda95e05ada0c7b72f224d0a36953 [diff] | |
parent | 02676e5aee271c1f20d7d44249d26741aef1e846 [diff] |
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