Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Apr 2006 21:24:20 +0000 (14:24 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Apr 2006 21:24:20 +0000 (14:24 -0700)
commit7c1c3eb855b5311118bed3b51c79d652d40148ec
treec1964e8d08318ccaaba8882d5eb38778311d7ead
parent6e5882cfa24e1456702e463f6920fc0ca3c3d2b8
parenteb20796bf6fdb95ccf51440ba2a827149bdc037f
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] splice: make the read-side do batched page lookups
  [PATCH] Add find_get_pages_contig(): contiguous variant of find_get_pages()
  [PATCH] splice: switch to using page_cache_readahead()