]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31c4ab4 51a92c0)
Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 13 Jul 2007 17:51:07 +0000 (10:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 13 Jul 2007 17:51:07 +0000 (10:51 -0700)
* '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()


Trivial merge
Linux 2.6 source tree