projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4fa6391
3eb4801
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 27 Mar 2006 16:47:29 +0000
(08:47 -0800)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 27 Mar 2006 16:47:29 +0000
(08:47 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: drop duplicate assignment in request_sock
[IPSEC]: Fix tunnel error handling in ipcomp6
Trivial merge