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

Browse source

...

This commit is contained in:

Linus Torvalds 2006-02-15 08:49:23 -08:00

parent 93544cc648 78872ccb68

commit 7775aa7690

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

2

include/linux/netfilter_ipv4.h

View file

4

net/bridge/br_stp_if.c

View file

41

net/ipv4/netfilter.c

View file

6

net/ipv4/netfilter/ip_nat_standalone.c

View file