From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 30 Jun 2006 22:40:17 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.18-rc1~252
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb;p=linux-2.6

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:
  [IPV6]: Added GSO support for TCPv6
  [NET]: Generalise TSO-specific bits from skb_setup_caps
  [IPV6]: Added GSO support for TCPv6
  [IPV6]: Remove redundant length check on input
  [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks
  [TG3]: Update version and reldate
  [TG3]: Add TSO workaround using GSO
  [TG3]: Turn on hw fix for ASF problems
  [TG3]: Add rx BD workaround
  [TG3]: Add tg3_netif_stop() in vlan functions
  [TCP]: Reset gso_segs if packet is dodgy
---

e37a72de84d27ee8bc0e7dbb5c2f1774ed306dbb