| commit | 7b97ebfb931887be63bfa29b6c143e9e9da3f5e8 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Apr 26 07:47:55 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Apr 26 07:47:55 2006 -0700 |
| tree | faaf77f68ef4192ac1a3c23f43fed122a080d341 | |
| parent | 07db8696f5d484485dde77138ff87d19c8628a75 [diff] | |
| parent | 1ebd32fc54bd04de6b3944587f25513c0681f98e [diff] |
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