From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 2 Apr 2007 22:22:20 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc6~21
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=856fc004b82ae31846b3037558ec1b2a6286e629;p=linux.git

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]: Do receiver-side SWS avoidance for rcvbuf < MSS.
  [BNX2]: Fix nvram write logic.
  [IPv6]: Fix incorrect length check in rawv6_sendmsg()
  [NET_SCHED]: cls_basic: fix memory leak in basic_destroy
  [NET]: Change "not found" return value for rule lookup
---

856fc004b82ae31846b3037558ec1b2a6286e629