tree 4e0fe5e78677c2ae56f6bd084b327e707b07c58b
parent 6a2a88668e90cd2459d0493e3e3ff17c3557febc
parent 9e0267c26e237f84f608a68e579bf4eb89dad819
author Linus Torvalds <torvalds@g5.osdl.org> 1145463952 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1145463952 -0700

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