| commit | cb46c3701fb7b738de1e22ac4f2d06d18f547a74 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed May 17 16:30:31 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed May 17 16:30:31 2006 -0700 |
| tree | 7d8740ed7849d31eaea19e696a4ea098ba151a96 | |
| parent | 9676489866a75fdd56b0d3e40ec7884298bb1338 [diff] | |
| parent | 8872d8e1c4311dd7e5086975df9c76120a0be83b [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 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().