David S. Miller 5510b3c2a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/s390/net/bpf_jit_comp.c drivers/net/ethernet/ti/netcp_ethss.c net/bridge/br_multicast.c net/ipv4/ip_fragment.c All four conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-31 23:52:20 -07:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-06-24 16:49:49 -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: vlan: flush the dynamically learned entries on port vlan delete	2015-06-24 05:40:55 -07:00
br_forward.c	bridge: Fix network header pointer for vlan tagged packets	2015-07-29 12:20:16 -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 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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
br_netfilter_hooks.c	netfilter: bridge: don't leak skb in error paths	2015-07-02 17:59:26 +02:00
br_netfilter_ipv6.c	netfilter: bridge: Use __in6_dev_get rather than in6_dev_get in br_validate_ipv6	2015-07-08 11:02:16 +02:00
br_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-31 23:52:20 -07:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private_stp.h
br_private.h	bridge: mdb: notify on router port add and del	2015-07-26 21:19:58 -07: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: 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_stp.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	bridge: vlan: flush the dynamically learned entries on port vlan delete	2015-06-24 05:40:55 -07:00
br.c	switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/	2015-05-12 18:43:52 -04:00
Kconfig
Makefile	netfilter: bridge: split ipv6 code into separated file	2015-06-18 21:14:21 +02:00