| commit | cbdf811c77cf2906a099b8da92e9f6f335b68a73 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Thu May 04 13:25:40 2006 -0400 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu May 04 13:25:40 2006 -0400 |
| tree | c4f96893936eddb31c60476ea4e776499d9046df | |
| parent | 936ef1d48ac9a9fc90746bacd93624969711775a [diff] | |
| parent | 98232d504db0a1f91ecaa93686ed3bf61963103b [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()