diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 21:51:07 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-13 21:51:07 +0400 |
| commit | 12a22960549979c10a95cc97f8ec63b461c55692 (patch) | |
| tree | 87b4130e0ae0f2a548087a3934bb7dba37ed6e87 /net | |
| parent | 31c4ab430a448cfb13fc88779d8a870c7af9f72b (diff) | |
| parent | 51a92c0f6ce8fa85fa0e18ecda1d847e606e8066 (diff) | |
| download | linux-12a22960549979c10a95cc97f8ec63b461c55692.tar.xz | |
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()
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions