Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
commit826adfe49a508f15943ce9140a3fc7f6c7661509
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 12 Jul 2006 15:14:48 +0000 (12 08:14 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 12 Jul 2006 15:14:48 +0000 (12 08:14 -0700)
tree134742fb3a90cf37a7c3449b6e14867159099f87
parent7c3dec0679c66ce177726802adbe2f403942fc27
parentaadd06e5c56b9ff5117ec77e59eada43dc46e2fc
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()