From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 13 Jul 2007 17:51:07 +0000 (-0700)
Subject: Merge branch 'splice-2.6.23' of git://git.kernel.dk/data/git/linux-2.6-block
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=12a22960549979c10a95cc97f8ec63b461c55692;p=openwrt%2Fstaging%2Fblogic.git

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()
---

12a22960549979c10a95cc97f8ec63b461c55692