From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 12 Jul 2006 15:14:48 +0000 (-0700)
Subject: Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.18-rc2~114
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=826adfe49a508f15943ce9140a3fc7f6c7661509;p=linux-2.6

Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] splice: fix problems with sys_tee()
---

826adfe49a508f15943ce9140a3fc7f6c7661509