Merge branch 'nf' of git://1984.lsi.us.es/net
Showing
- include/net/ip_vs.h 1 addition, 0 deletionsinclude/net/ip_vs.h
- net/netfilter/ipvs/ip_vs_ctl.c 80 additions, 51 deletionsnet/netfilter/ipvs/ip_vs_ctl.c
- net/netfilter/ipvs/ip_vs_sync.c 6 additions, 0 deletionsnet/netfilter/ipvs/ip_vs_sync.c
- net/netfilter/nf_conntrack_proto_gre.c 2 additions, 2 deletionsnet/netfilter/nf_conntrack_proto_gre.c
Please register or sign in to comment