From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 19 Apr 2006 16:25:52 +0000 (-0700)
Subject: Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0efd9323f32c137b5cf48bc6582cd08556e7cdfc;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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: fixup writeout path after ->map changes
  [PATCH] splice: offset fixes
  [PATCH] tee: link_pipe() must be careful when dropping one of the pipe locks
  [PATCH] splice: cleanup the SPLICE_F_NONBLOCK handling
  [PATCH] splice: close i_size truncate races on read
---

0efd9323f32c137b5cf48bc6582cd08556e7cdfc