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

..

netfilter

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

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

br_device.c

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

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

br_fdb.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

br_forward.c

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

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

br_if.c

bridge: make bridge support netpoll

2010-05-06 00:48:24 -07:00

br_input.c

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

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

br_ioctl.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

br_multicast.c

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

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

br_netfilter.c

netfilter: bridge-netfilter: fix refragmenting IP traffic encapsulated in PPPoE traffic

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

br_netlink.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

br_notify.c

net: forbid underlaying devices to change its type

2010-03-18 20:00:02 -07:00

br_private_stp.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

br_private.h

bridge: make bridge support netpoll

2010-05-06 00:48:24 -07:00

br_stp_bpdu.c

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

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

br_stp_if.c

bridge: Add multicast start/stop hooks

2010-02-28 00:49:38 -08:00

br_stp_timer.c

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

br_stp.c

bridge: Add multicast start/stop hooks

2010-02-28 00:49:38 -08:00

br_sysfs_br.c

bridge: Add multicast count/interval sysfs entries

2010-02-28 00:49:47 -08:00

br_sysfs_if.c

Driver core: Constify struct sysfs_ops in struct kobj_type

2010-03-07 17:04:49 -08:00

br.c

bridge: Use rcu_barrier() instead of syncronize_net() on unload.

2009-06-26 13:51:32 -07:00

Kconfig

bridge br_multicast: IPv6 MLD support.

2010-04-23 13:35:56 +09:00

Makefile

bridge: Add core IGMP snooping support

2010-02-28 00:48:45 -08:00