tree 38f87e68f1cd36159fe5b9c03e9047b2fe374324
parent cf105601df49ba0ea5ac04a6154c6c1442994c74
parent 7afa6fd037e51e95d322990cb127bb2b1217251a
author Linus Torvalds <torvalds@g5.osdl.org> 1146533620 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1146533620 -0700

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