projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 936ef1d 98232d5)
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:40 +0000 (13:25 -0400)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:40 +0000 (13:25 -0400)
commitcbdf811c77cf2906a099b8da92e9f6f335b68a73
treec4f96893936eddb31c60476ea4e776499d9046dftree | snapshot
parent936ef1d48ac9a9fc90746bacd93624969711775acommit | diff
parent98232d504db0a1f91ecaa93686ed3bf61963103bcommit | 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] compat_sys_vmsplice: one-off in UIO_MAXIOV check
  [PATCH] splice: redo page lookup if add_to_page_cache() returns -EEXIST
  [PATCH] splice: rename remaining info variables to pipe
  [PATCH] splice: LRU fixups
  [PATCH] splice: fix unlocking of page on error ->prepare_write()
John Crispins staging tree