92ac1a3c23f43fed122a080d341
parent 07db8696f5d484485dde77138ff87d19c8628a75
parent 1ebd32fc54bd04de6b3944587f25513c0681f98e
author Linus Torvalds <torvalds@g5.osdl.org> 1146062875 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1146062875 -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] splice: add ->splice_write support for /dev/null
  [PATCH] splice: rearrange moving to/from pipe helpers
  [PATCH] Add support for the sys_vmsplice syscall
  [PATCH] splice: fix offset problems
  [PATCH] splice: fix min() warning
ÛXÐ