Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 14:47:55 +0000 (07:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 26 Apr 2006 14:47:55 +0000 (07:47 -0700)
commit7b97ebfb931887be63bfa29b6c143e9e9da3f5e8
treefaaf77f68ef4192ac1a3c23f43fed122a080d341
parent07db8696f5d484485dde77138ff87d19c8628a75
parent1ebd32fc54bd04de6b3944587f25513c0681f98e
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