Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

Browse source

...

This commit is contained in:

David S. Miller 2010-01-08 13:15:47 -08:00

parent b7a9216c5a dce766af54

commit 31b683b644

5 changed files with 31 additions and 25 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

6

net/bridge/netfilter/ebtables.c

View file

3

net/netfilter/ipvs/Kconfig

View file

14

net/netfilter/ipvs/ip_vs_ctl.c

View file

15

net/netfilter/ipvs/ip_vs_wrr.c

View file

18

net/netfilter/nf_conntrack_ftp.c

View file