David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/net/inetpeer.h net/ipv6/output_core.c Changes in net were fixing bugs in code removed in net-next. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-06-03 23:32:12 -07:00
..
netfilter	netfilter: bridge: fix Kconfig unmet dependencies	2014-05-26 00:42:30 -04:00
br.c	bridge: make br_device_notifier static	2014-05-22 15:33:47 -04:00
br_device.c	bridge: Automatically manage port promiscuous mode.	2014-05-16 17:06:33 -04:00
br_fdb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
br_forward.c	bridge: use is_skb_forwardable in forward path	2014-03-31 16:04:04 -04:00
br_if.c	bridge: fix the unbalanced promiscuous count when add_if failed	2014-06-01 22:05:16 -07:00
br_input.c	bridge: Prevent insertion of FDB entry with disallowed vlan	2014-06-02 13:38:23 -07:00
br_ioctl.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_mdb.c	Revert "bridge: only expire the mdb entry when query is received"	2013-10-22 14:41:02 -04:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
br_netfilter.c	vlan: rename __vlan_find_dev_deep() to __vlan_find_dev_deep_rcu()	2014-05-12 14:39:13 -04:00
br_netlink.c	bridge: Keep track of ports capable of automatic discovery.	2014-05-16 17:06:33 -04:00
br_private.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
br_private_stp.h	net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes	2013-10-19 19:12:11 -04:00
br_stp.c	bridge: Clamp forward_delay when enabling STP	2013-09-12 23:32:14 -04:00
br_stp_bpdu.c	br: fix use of ->rx_handler_data in code executed on non-rx_handler path	2013-12-06 15:41:40 -05:00
br_stp_if.c	bridge: Change local fdb entries whenever mac address of bridge device changes	2014-02-10 14:34:33 -08:00
br_stp_timer.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_sysfs_br.c	bridge: use DEVICE_ATTR_xx macros	2014-01-06 16:40:46 -05:00
br_sysfs_if.c	bridge: Keep track of ports capable of automatic discovery.	2014-05-16 17:06:33 -04:00
br_vlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-06-03 23:32:12 -07:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	netfilter: bridge: fix Kconfig unmet dependencies	2014-05-26 00:42:30 -04:00