| commit | e46dc1dab969550d4136e9be0e7919ca09e49573 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Oct 08 12:59:10 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Oct 08 12:59:10 2007 -0700 |
| tree | 86dbc21796b402c895fd96d5197bf38d8d060545 | |
| parent | 87e2831c3fa39cbf6f7ab676bb5aef039b9659e2 [diff] | |
| parent | bf0b48dfc368c07c42b5a3a5658c8ee81b4283ac [diff] |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPv6]: Fix ICMPv6 redirect handling with target multicast address [PKT_SCHED] cls_u32: error code isn't been propogated properly [ROSE]: Fix rose.ko oops on unload [TCP]: Fix fastpath_cnt_hint when GSO skb is partially ACKed