tree 189bc08337771f9318b3b789f44949c84bd9ed7e
parent 5c0efdbc1b1891857659594741a4cb6405b63126
parent 84565070e442583ec67fb08a5962c80203e491c3
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175552540 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175552540 -0700

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