projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
37b0d1d
42d1d52
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 12 Jun 2006 20:46:27 +0000
(13:46 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Mon, 12 Jun 2006 20:46:27 +0000
(13:46 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IPV4]: Increment ipInHdrErrors when TTL expires.
[TCP]: continued: reno sacked_out count fix
[DCCP] Ackvec: fix soft lockup in ackvec handling code
Trivial merge