From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 8 Oct 2007 19:59:10 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.23~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e46dc1dab969550d4136e9be0e7919ca09e49573;p=linux-2.6-omap-h63xx.git

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
---

e46dc1dab969550d4136e9be0e7919ca09e49573