diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:22:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-10 17:22:16 -0700 |
commit | 9631eb0bc18bc1fd1cc84e535260d67ed6a36865 (patch) | |
tree | 4035e815fe051d0c357a10c4201c0fca2ffdbdcd /include | |
parent | b4dfd6bc35f6c1e0fcbb4268c523b3939955d3af (diff) | |
parent | 50c9cc2e540aeaab78ab548a8d42568977c6844f (diff) | |
download | linux-9631eb0bc18bc1fd1cc84e535260d67ed6a36865.tar.gz linux-9631eb0bc18bc1fd1cc84e535260d67ed6a36865.tar.bz2 linux-9631eb0bc18bc1fd1cc84e535260d67ed6a36865.zip |
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions