linux/net/bridge
Colin Cross f02fac6330 Merge commit 'v3.4-rc6' into android-3.4
Conflicts:
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c

Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91
2012-05-07 18:20:34 -07:00
..
netfilter netfilter: bridge: fix wrong pointer dereference 2012-03-06 14:43:49 -05:00
br_device.c bridge: Have tx_bytes count headers like rx_bytes. 2012-04-09 13:57:57 -07:00
br_fdb.c bridge: BH already disabled in br_fdb_cleanup() 2012-01-17 10:17:32 -05:00
br_forward.c set fake_rtable's dst to NULL to avoid kernel Oops 2012-04-24 00:16:24 -04: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 net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules 2011-10-31 19:30:30 -04: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: Do not send queries on multicast group leaves 2012-04-11 09:43:13 -04:00
br_netfilter.c set fake_rtable's dst to NULL to avoid kernel Oops 2012-04-24 00:16:24 -04: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 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: Do not send queries on multicast group leaves 2012-04-11 09:43:13 -04:00
br_stp_bpdu.c bridge: minor cleanups 2011-07-22 17:01:13 -07:00
br_stp_if.c bridge: fix state reporting when port is disabled 2012-03-08 00:25:25 -08: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: br_log_state() s/entering/entered/ 2012-03-08 00:25:25 -08:00
br_sysfs_br.c bridge: allow forwarding some link local frames 2011-10-06 15:27:56 -04:00
br_sysfs_if.c bridge: range check STP parameters 2011-04-04 17:22:29 -07:00
br.c net:bridge: use IS_ENABLED 2011-12-16 15:49:52 -05: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