Patrick McHardy 6291055465 Merge branch 'master' of /repos/git/net-next-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt net/ipv6/netfilter/ip6t_REJECT.c net/netfilter/xt_limit.c Signed-off-by: Patrick McHardy <kaber@trash.net>		2010-04-20 16:02:01 +02:00
..
netfilter	Merge branch 'master' of /repos/git/net-next-2.6	2010-04-20 16:02:01 +02:00
br_device.c	netfilter: bridge-netfilter: simplify IP DNAT	2010-04-15 12:14:51 +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-04-20 16:02:01 +02:00
br_if.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -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-04-20 16:02:01 +02:00
br_netfilter.c	Merge branch 'master' of /repos/git/net-next-2.6	2010-04-20 16:02: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
br_private.h	bridge: per-cpu packet statistics (v3)	2010-03-16 21:23:19 -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
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
Kconfig	bridge: depends on INET	2010-03-03 01:23:22 -08:00
Makefile	bridge: Add core IGMP snooping support	2010-02-28 00:48:45 -08:00