From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 2 May 2006 01:33:40 +0000 (-0700)
Subject: Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.17-rc4~63
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4;p=~shefty%2Frdma-dev.git

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] vmsplice: allow user to pass in gift pages
  [PATCH] pipe: enable atomic copying of pipe data to/from user space
  [PATCH] splice: call handle_ra_miss() on failure to lookup page
  [PATCH] Add ->splice_read/splice_write to def_blk_fops
  [PATCH] pipe: introduce ->pin() buffer operation
  [PATCH] splice: fix bugs in pipe_to_file()
  [PATCH] splice: fix bugs with stealing regular pipe pages
---

9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4