Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:22:16 +0000 (17:22 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 11 Apr 2007 00:22:16 +0000 (17:22 -0700)
commit9631eb0bc18bc1fd1cc84e535260d67ed6a36865
tree4035e815fe051d0c357a10c4201c0fca2ffdbdcd
parentb4dfd6bc35f6c1e0fcbb4268c523b3939955d3af
parent50c9cc2e540aeaab78ab548a8d42568977c6844f
Merge /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