linux/net/bridge
David S. Miller b4aa9e05a6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/bnx2x/bnx2x.h
	drivers/net/wireless/iwlwifi/iwl-1000.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/vhost/vhost.c
2010-12-17 12:27:22 -08:00
..
netfilter bridge: fix RCU races with bridge port 2010-11-15 11:13:17 -08:00
br.c bridge: add proper RCU annotation to should_route_hook 2010-11-15 11:13:16 -08:00
br_device.c net: Abstract away all dst_entry metrics accesses. 2010-12-09 10:46:36 -08:00
br_fdb.c bridge: fix RCU races with bridge port 2010-11-15 11:13:17 -08:00
br_forward.c bridge: add RCU annotation to bridge multicast table 2010-11-15 11:13:16 -08:00
br_if.c bridge: add RCU annotations to bridge port lookup 2010-11-15 11:13:18 -08:00
br_input.c bridge: add proper RCU annotation to should_route_hook 2010-11-15 11:13:16 -08:00
br_ioctl.c bridge: change console message interface 2010-05-15 23:10:02 -07:00
br_multicast.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-12-17 12:27:22 -08:00
br_netfilter.c bridge: Use consistent NF_DROP returns in nf_pre_routing 2010-12-10 16:04:53 -08:00
br_netlink.c bridge: add RCU annotations to bridge port lookup 2010-11-15 11:13:18 -08:00
br_notify.c bridge: add RCU annotations to bridge port lookup 2010-11-15 11:13:18 -08:00
br_private.h bridge: add RCU annotations to bridge port lookup 2010-11-15 11:13:18 -08:00
br_private_stp.h net: remove CVS keywords 2008-06-11 21:00:38 -07:00
br_stp.c bridge: change console message interface 2010-05-15 23:10:02 -07:00
br_stp_bpdu.c bridge: fix RCU races with bridge port 2010-11-15 11:13:17 -08:00
br_stp_if.c bridge: change console message interface 2010-05-15 23:10:02 -07:00
br_stp_timer.c bridge: change console message interface 2010-05-15 23:10:02 -07:00
br_sysfs_br.c bridge: add per bridge device controls for invoking iptables 2010-07-02 09:32:57 +02:00
br_sysfs_if.c bridge: update sysfs link names if port device names have changed 2010-05-15 23:10:15 -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