From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 11 Apr 2007 00:22:16 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.21-rc7~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9631eb0bc18bc1fd1cc84e535260d67ed6a36865;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:
  [NETFILTER]: ipt_CLUSTERIP: fix oops in checkentry function
  [TCP]: slow_start_after_idle should influence cwnd validation too
  [SC92031]: Fix priv->lock context
  [NET_SCHED]: cls_tcindex: fix compatibility breakage
---

9631eb0bc18bc1fd1cc84e535260d67ed6a36865