projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ea88d6 02676e5)
Merge branch 'splice-2.6.22' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 23:15:01 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 23:15:01 +0000 (16:15 -0700)
* '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


Trivial merge
John Crispins staging tree