Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

* 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

...

This commit is contained in:

Linus Torvalds 2007-04-10 17:22:16 -07:00

parent b4dfd6bc35 50c9cc2e54

commit 9631eb0bc1

4 changed files with 14 additions and 15 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

drivers/net/sc92031.c

View file

2

net/ipv4/netfilter/ipt_CLUSTERIP.c

View file

3

net/ipv4/tcp_output.c

View file

4

net/sched/cls_tcindex.c

View file