projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
936ef1d
98232d5
)
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
author
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:40 +0000
(13:25 -0400)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:40 +0000
(13:25 -0400)
* '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()
Trivial merge