David S. Miller 3a07bd6fea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/main.c net/packet/af_packet.c Both conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-24 02:58:51 -07:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
br_device.c	netfilter: bridge: use rcu hook to resolve br_netfilter dependency	2015-03-10 15:03:02 +01:00
br_fdb.c	bridge: del external_learned fdbs from device on flush or ageout	2015-06-15 17:08:49 -07:00
br_forward.c	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
br_if.c	bridge: reset bridge mtu after deleting an interface	2015-03-14 19:12:38 -04:00
br_input.c	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04: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: remove wrong use of NLM_F_MULTI	2015-04-29 14:59:16 -04:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-24 02:58:51 -07:00
br_netfilter_hooks.c	netfilter: bridge: split ipv6 code into separated file	2015-06-18 21:14:21 +02:00
br_netfilter_ipv6.c	netfilter: bridge: split ipv6 code into separated file	2015-06-18 21:14:21 +02:00
br_netlink.c	bridge: revert br_dellink change back to original	2015-05-12 18:43:55 -04:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -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_private.h	netfilter: bridge: forward IPv6 fragmented packets	2015-06-12 14:10:12 +02:00
br_stp_bpdu.c	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
br_stp_if.c	bridge: fix br_stp_set_bridge_priority race conditions	2015-06-18 03:29:47 -07:00
br_stp_timer.c	bridge: fix lockdep splat	2015-05-22 16:23:56 -04:00
br_stp.c	bridge: multicast: start querier timer when running user-space stp	2015-06-23 03:29:54 -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: Extend Proxy ARP design to allow optional rules for Wi-Fi	2015-03-05 14:52:23 -05:00
br_vlan.c	switchdev: rename vlan vid_start to vid_begin	2015-06-23 06:56:18 -07:00
br.c	switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/	2015-05-12 18:43:52 -04: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