| commit | 9ca686626c012935b3b8219815e9027facc6fe6e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Apr 14 09:02:07 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Apr 14 09:02:07 2006 -0700 |
| tree | 632364c2feb6b4c08d83d3014e771dee55f1e4c1 | |
| parent | e57a5059846e55d82b86d96dde40e988598601b3 [diff] | |
| parent | 70524490ee2ea1bbf6cee6c106597b3ac25a3fc2 [diff] |
Merge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block * 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] splice: add support for sys_tee() [PATCH] splice: pass offset around for ->splice_read() and ->splice_write()