David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/arp.c The net/ipv4/arp.c conflict was one commit adding a new local variable while another commit was deleting one. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-09-26 16:08:27 -07:00
..
netfilter	netfilter: Pass priv instead of nf_hook_ops to netfilter hooks	2015-09-18 22:00:16 +02:00
br.c	switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/	2015-05-12 18:43:52 -04:00
br_device.c	bridge: define some min/max/default ageing time constants	2015-09-23 14:35:58 -07:00
br_fdb.c	bridge: don't age externally added FDB entries	2015-09-23 14:35:58 -07:00
br_forward.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
br_if.c	bridge: multicast: fix handling of temp and perm entries	2015-07-20 12:49:10 -07:00
br_input.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
br_ioctl.c	bridge: fix br_stp_set_bridge_priority race conditions	2015-06-18 03:29:47 -07:00
br_mdb.c	bridge: mdb: fix vlan_enabled access when vlans are not configured	2015-08-03 16:20:51 -07:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-09-26 16:08:27 -07:00
br_netfilter_hooks.c	netfilter: Pass priv instead of nf_hook_ops to netfilter hooks	2015-09-18 22:00:16 +02:00
br_netfilter_ipv6.c	netfilter: Pass priv instead of nf_hook_ops to netfilter hooks	2015-09-18 22:00:16 +02:00
br_netlink.c	net: bridge: remove unnecessary switchdev include	2015-09-08 22:33:14 -07:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private.h	netfilter: Pass net into okfn	2015-09-17 17:18:37 -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: stp: when using userspace stp stop kernel hello and hold timers	2015-07-28 23:33:20 -07:00
br_stp_bpdu.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
br_stp_if.c	bridge: stp: when using userspace stp stop kernel hello and hold timers	2015-07-28 23:33:20 -07:00
br_stp_timer.c	bridge: stp: when using userspace stp stop kernel hello and hold timers	2015-07-28 23:33:20 -07:00
br_sysfs_br.c	bridge: Add a default_pvid sysfs attribute	2014-10-05 21:21:36 -04:00
br_sysfs_if.c	bridge: vlan: flush the dynamically learned entries on port vlan delete	2015-06-24 05:40:55 -07:00
br_vlan.c	net: bridge: check __vlan_vid_del for error	2015-09-08 22:28:45 -07:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	netfilter: bridge: split ipv6 code into separated file	2015-06-18 21:14:21 +02:00