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

Browse source

...

This commit is contained in:

David S. Miller 2011-01-31 12:31:24 -08:00

parent b8dad61cc7 6a4ddef2a3

commit c79b9e4936

6 changed files with 35 additions and 13 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/netfilter/ipvs/ip_vs_core.c

View file

6

net/netfilter/ipvs/ip_vs_ctl.c

View file

4

net/netfilter/ipvs/ip_vs_proto.c

View file

4

net/netfilter/ipvs/ip_vs_sync.c

View file

12

net/netfilter/xt_connlimit.c

View file

18

net/netfilter/xt_iprange.c

View file