projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6a2a886 9e0267c)
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 16:25:52 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 19 Apr 2006 16:25:52 +0000 (09:25 -0700)
commit0efd9323f32c137b5cf48bc6582cd08556e7cdfc
tree4e0fe5e78677c2ae56f6bd084b327e707b07c58btree | snapshot
parent6a2a88668e90cd2459d0493e3e3ff17c3557febccommit | diff
parent9e0267c26e237f84f608a68e579bf4eb89dad819commit | diff
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
John Crispins staging tree