]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e57a505 7052449)
Merge branch 'tee' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 14 Apr 2006 16:02:07 +0000 (09:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 14 Apr 2006 16:02:07 +0000 (09:02 -0700)
* '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()


Trivial merge
Linux 2.6 source tree