OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9676489
8872d8e
)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 17 May 2006 23:30:31 +0000
(16:30 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 17 May 2006 23:30:31 +0000
(16:30 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TCP]: reno sacked_out count fix
[IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match().
[TR]: Remove an unused export.
[IPX]: Correct return type of ipx_map_frame_type().
[IPX]: Correct argument type of ipxrtr_delete().
[PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().
Trivial merge