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

Browse source

...

This commit is contained in:

Linus Torvalds 2005-12-01 15:54:00 -08:00

parent ca98f825ea ea86575eaf

commit deda498710

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

8

net/ipv4/fib_frontend.c

View file

29

net/ipv4/netfilter/ip_conntrack_proto_tcp.c

View file

1

net/ipv4/netfilter/ipt_recent.c

View file

29

net/netfilter/nf_conntrack_proto_tcp.c

View file