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

include/net/ip_vs.h

net/ipv4/ipvs/Kconfig

net/ipv4/ipvs/ip_vs_conn.c

net/ipv4/ipvs/ip_vs_core.c

net/ipv4/ipvs/ip_vs_ctl.c

net/ipv4/ipvs/ip_vs_dh.c

net/ipv4/ipvs/ip_vs_est.c

net/ipv4/ipvs/ip_vs_ftp.c

net/ipv4/ipvs/ip_vs_lblc.c

net/ipv4/ipvs/ip_vs_lblcr.c

net/ipv4/ipvs/ip_vs_lc.c

net/ipv4/ipvs/ip_vs_nq.c

net/ipv4/ipvs/ip_vs_proto.c

net/ipv4/ipvs/ip_vs_proto_ah_esp.c

net/ipv4/ipvs/ip_vs_proto_tcp.c

net/ipv4/ipvs/ip_vs_proto_udp.c

net/ipv4/ipvs/ip_vs_rr.c

net/ipv4/ipvs/ip_vs_sed.c

net/ipv4/ipvs/ip_vs_sh.c

net/ipv4/ipvs/ip_vs_sync.c