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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-11-17 17:26:26 -08:00

parent 976164497d 9e147a1cfc

commit 42f9cabebe

7 changed files with 20 additions and 41 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

4

net/ipv4/netfilter/ip_conntrack_ftp.c

View file

4

net/ipv4/netfilter/ip_conntrack_irc.c

View file

4

net/ipv4/netfilter/ip_conntrack_tftp.c

View file

2

net/ipv4/tcp_highspeed.c

View file

2

net/ipv6/route.c

View file

8

net/llc/llc_c_ac.c

View file

37

net/sched/Kconfig

View file