kernel-aes67/net/bridge
David S. Miller 8decf86879 Merge branch 'master' of github.com:davem330/net
Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c
2011-09-22 03:23:13 -04:00
..
netfilter Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
br_device.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
br_fdb.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
br_forward.c net: bridge: check the length of skb after nf_bridge_maybe_copy_header() 2011-01-06 11:33:05 -08:00
br_if.c Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
br_input.c bridge: Always flood broadcast packets 2011-07-05 18:39:39 -07:00
br_ioctl.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-04-11 13:44:25 -07:00
br_multicast.c bridge: fix a possible use after free 2011-08-24 17:49:24 -07:00
br_netfilter.c net: Add ->neigh_lookup() operation to dst_ops 2011-07-18 00:40:17 -07:00
br_netlink.c bridge: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_notify.c Bridge: Always send NETDEV_CHANGEADDR up on br MAC change. 2011-08-09 21:44:44 -07:00
br_private_stp.h bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_private.h bridge: send proper message_age in config BPDU 2011-07-22 17:01:12 -07:00
br_stp_bpdu.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_stp_if.c bridge: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_stp_timer.c bridge: add notification over netlink when STP changes state 2011-07-22 17:01:12 -07:00
br_stp.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_sysfs_br.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br_sysfs_if.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br.c bridge: allow creating bridge devices with netlink 2011-04-04 17:22:28 -07:00
Kconfig net: bridge builtin vs. ipv6 modular 2011-03-10 13:45:57 -08:00
Makefile bridge: Add core IGMP snooping support 2010-02-28 00:48:45 -08:00