Patrick McHardy 1e4b105712 Merge branch 'master' of /repos/git/net-next-2.6 ...

Conflicts:
	net/bridge/br_device.c
	net/bridge/br_forward.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2010-05-10 18:39:28 +02:00

..

ip_vs_app.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_conn.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_core.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_ctl.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_dh.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_est.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_ftp.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

ip_vs_lblc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_lblcr.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_lc.c

IPVS: use pr_err and friends instead of IP_VS_ERR and friends

2009-08-02 18:29:30 -07:00

ip_vs_nq.c

IPVS: use pr_err and friends instead of IP_VS_ERR and friends

2009-08-02 18:29:30 -07:00

ip_vs_proto_ah_esp.c

IPVS: fix potential stack overflow with overly long protocol names

2010-04-08 13:35:47 +02:00

ip_vs_proto_sctp.c

ipvs: SCTP Trasport Loadbalancing Support

2010-02-18 12:31:05 +01:00

ip_vs_proto_tcp.c

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

ip_vs_proto_udp.c

net: mark read-only arrays as const

2009-08-05 10:42:58 -07:00

ip_vs_proto.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

ip_vs_rr.c

IPVS: use pr_err and friends instead of IP_VS_ERR and friends

2009-08-02 18:29:30 -07:00

ip_vs_sched.c

IPVS: use pr_err and friends instead of IP_VS_ERR and friends

2009-08-02 18:29:30 -07:00

ip_vs_sed.c

IPVS: use pr_err and friends instead of IP_VS_ERR and friends

2009-08-02 18:29:30 -07:00

ip_vs_sh.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_sync.c

net: sk_sleep() helper

2010-04-20 16:37:13 -07:00

ip_vs_wlc.c

IPVS: use pr_fmt

2009-07-30 14:29:44 -07:00

ip_vs_wrr.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ip_vs_xmit.c

Merge branch 'master' of /repos/git/net-next-2.6

2010-04-20 16:02:01 +02:00

Kconfig

ipvs: SCTP Trasport Loadbalancing Support

2010-02-18 12:31:05 +01:00

Makefile

ipvs: SCTP Trasport Loadbalancing Support

2010-02-18 12:31:05 +01:00