projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0b699e3
2784f40
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 20 Apr 2006 14:58:58 +0000
(07:58 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Thu, 20 Apr 2006 14:58:58 +0000
(07:58 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: __NR_sys_splice --> __NR_splice
Trivial merge