David S. Miller b4017c5368 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/tg3.c Conflicts in the statistics regression bug fix from 'net', but happily Matt Carlson originally posted the fix against 'net-next' so I used that to resolve this. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-03-01 17:57:40 -05:00
..
netfilter	netfilter: bridge: fix module autoload in compat case	2012-02-25 14:29:09 +01:00
br_device.c	br_device: unify return value of .ndo_set_mac_address if address is invalid	2012-02-23 17:03:20 -05:00
br_fdb.c	bridge: BH already disabled in br_fdb_cleanup()	2012-01-17 10:17:32 -05:00
br_forward.c	bridge: add local MAC address to forwarding table (v2)	2011-12-08 19:40:28 -05:00
br_if.c	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
br_input.c
br_ioctl.c
br_multicast.c	net: use IS_ENABLED(CONFIG_IPV6)	2011-12-11 18:25:16 -05:00
br_netfilter.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
br_netlink.c	bridge: master device stuck in no-carrier state forever when in user-stp mode	2011-12-01 14:05:17 -05:00
br_notify.c
br_private_stp.h
br_private.h	net:bridge: use IS_ENABLED	2011-12-16 15:49:52 -05:00
br_stp_bpdu.c
br_stp_if.c	net: fix implicit kmod.h usage in bridge/br_stp_if.c	2011-10-31 19:30:30 -04:00
br_stp_timer.c
br_stp.c	bridge: master device stuck in no-carrier state forever when in user-stp mode	2011-12-01 14:05:17 -05:00
br_sysfs_br.c
br_sysfs_if.c
br.c	net:bridge: use IS_ENABLED	2011-12-16 15:49:52 -05:00
Kconfig
Makefile