David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:

	drivers/message/fusion/mptlan.c
	drivers/net/sfc/ethtool.c
	net/mac80211/debugfs_sta.c

2008-11-11 15:43:02 -08:00

..

ip_vs_app.c

…

ip_vs_conn.c

net: replace %p6 with %pI6

2008-10-29 12:52:50 -07:00

ip_vs_core.c

net: replace NIPQUAD() in net/netfilter/

2008-10-31 00:54:29 -07:00

ip_vs_ctl.c

net: '&' redux

2008-11-03 18:21:05 -08:00

ip_vs_dh.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_est.c

…

ip_vs_ftp.c

net: replace NIPQUAD() in net/netfilter/

2008-10-31 00:54:29 -07:00

ip_vs_lblc.c

net: '&' redux

2008-11-03 18:21:05 -08:00

ip_vs_lblcr.c

net: '&' redux

2008-11-03 18:21:05 -08:00

ip_vs_lc.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_nq.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_proto_ah_esp.c

net: replace NIPQUAD() in net/netfilter/

2008-10-31 00:54:29 -07:00

ip_vs_proto_tcp.c

ipvs: oldlen, newlen should be be16, not be32

2008-11-06 23:09:56 -08:00

ip_vs_proto_udp.c

ipvs: oldlen, newlen should be be16, not be32

2008-11-06 23:09:56 -08:00

ip_vs_proto.c

net: replace NIPQUAD() in net/netfilter/

2008-10-31 00:54:29 -07:00

ip_vs_rr.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_sched.c

…

ip_vs_sed.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_sh.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_sync.c

net: replace NIPQUAD() in net/netfilter/

2008-10-31 00:54:29 -07:00

ip_vs_wlc.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_wrr.c

IPVS: Remove supports_ipv6 scheduler flag

2008-11-03 17:08:56 -08:00

ip_vs_xmit.c

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

2008-11-11 15:43:02 -08:00

Kconfig

ipvs: Update CONFIG_IP_VS_IPV6 description and help text

2008-10-19 23:29:56 -07:00

Makefile

…