Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/lvs-test-2.6

Browse source

...

This commit is contained in:

Patrick McHardy 2010-11-16 10:21:27 +01:00

parent 3bfd45f93c 8f1b03a4c1

commit 2c2bf08614

6 changed files with 65 additions and 56 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

18

include/net/ip_vs.h

View file

31

net/netfilter/ipvs/ip_vs_conn.c

View file

4

net/netfilter/ipvs/ip_vs_ctl.c

View file

14

net/netfilter/ipvs/ip_vs_pe.c

View file

28

net/netfilter/ipvs/ip_vs_sync.c

View file

26

net/netfilter/ipvs/ip_vs_xmit.c

View file