| commit | 12a22960549979c10a95cc97f8ec63b461c55692 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jul 13 10:51:07 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Jul 13 10:51:07 2007 -0700 |
| tree | 87b4130e0ae0f2a548087a3934bb7dba37ed6e87 | |
| parent | 31c4ab430a448cfb13fc88779d8a870c7af9f72b [diff] | |
| parent | 51a92c0f6ce8fa85fa0e18ecda1d847e606e8066 [diff] |
Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block * 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block: splice: fix offset mangling with direct splicing (sendfile) security: revalidate rw permissions for sys_splice and sys_vmsplice relay: fixup kerneldoc comment relay: fix bogus cast in subbuf_splice_actor()