From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 14 Apr 2006 16:02:07 +0000 (-0700)
Subject: Merge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.17-rc2~74
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ca686626c012935b3b8219815e9027facc6fe6e;p=pandora-kernel.git

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

9ca686626c012935b3b8219815e9027facc6fe6e