Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 8 Oct 2007 19:59:10 +0000 (12:59 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 8 Oct 2007 19:59:10 +0000 (12:59 -0700)
commite46dc1dab969550d4136e9be0e7919ca09e49573
tree86dbc21796b402c895fd96d5197bf38d8d060545
parent87e2831c3fa39cbf6f7ab676bb5aef039b9659e2
parentbf0b48dfc368c07c42b5a3a5658c8ee81b4283ac
Merge branch 'master' of /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