David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en.h drivers/net/ethernet/mellanox/mlx5/core/en_main.c drivers/net/usb/r8152.c All three conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-07-06 10:35:22 -07:00
..
netfilter	netfilter: Convert FWINV<[foo]> macros and uses to NF_INVF	2016-07-03 10:55:07 +02: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
br.c	switchdev: Require RTNL mutex to be held when sending FDB notifications	2016-01-28 16:21:31 -08:00
br_device.c	net: introduce default neigh_construct/destroy ndo calls for L2 upper devices	2016-07-05 09:06:28 -07:00
br_fdb.c	bridge: Don't insert unnecessary local fdb entry on changing mac address	2016-06-08 00:31:38 -07:00
br_forward.c	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_if.c	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_input.c	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_ioctl.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
br_mdb.c	bridge: mdb: Marking port-group as offloaded	2016-04-24 14:23:32 -04:00
br_multicast.c	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_netfilter_hooks.c	ipv4: Fix ip_skb_dst_mtu to use the sk passed by ip_finish_output	2016-06-30 09:02:48 -04:00
br_netfilter_ipv6.c	ipv6: rename IP6_INC_STATS_BH()	2016-04-27 22:48:24 -04:00
br_netlink.c	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private.h	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04: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: Allow set bridge ageing time when switchdev disabled	2016-03-30 15:38:13 -04:00
br_stp_bpdu.c	netfilter: Pass net into okfn	2015-09-17 17:18:37 -07:00
br_stp_if.c	net: bridge: log port STP state on change	2016-02-18 14:20:08 -05:00
br_stp_timer.c	net: bridge: log port STP state on change	2016-02-18 14:20:08 -05:00
br_sysfs_br.c	net: bridge: add support for IGMP/MLD stats and export them via netlink	2016-06-30 06:18:24 -04:00
br_sysfs_if.c	bridge: a netlink notification should be sent when those attributes are changed by br_sysfs_if	2016-04-13 22:42:33 -04:00
br_vlan.c	bridge: netlink: export per-vlan stats	2016-05-02 22:27:06 -04:00