David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-10-23 16:49:34 -04:00

..

netfilter

netfilter: nf_tables: complete net namespace support

2013-10-14 18:00:59 +02:00

br_device.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-09-05 14:58:52 -04:00

br_fdb.c

bridge: Don't use VID 0 and 4095 in vlan filtering

2013-10-18 16:02:52 -04:00

br_forward.c

bridge: Add a flag to control unicast packet flood.

2013-06-11 02:04:32 -07:00

br_if.c

bridge: inherit slave devices needed_headroom

2013-08-29 15:17:09 -04:00

br_input.c

bridge: separate querier and query timer into IGMP/IPv4 and MLD/IPv6 ones

2013-08-30 15:24:37 -04:00

br_ioctl.c

net: Allow userns root to control the network bridge code.

2012-11-18 20:33:00 -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

2013-10-23 16:49:34 -04:00

br_netfilter.c

netfilter: pass hook ops to hookfn

2013-10-14 11:29:31 +02:00

br_netlink.c

bridge: Don't use VID 0 and 4095 in vlan filtering

2013-10-18 16:02:52 -04:00

br_notify.c

net: convert resend IGMP to notifier event

2013-07-23 16:52:47 -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_private.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-10-23 16:49:34 -04:00

br_stp_bpdu.c

bridge: set priority of STP packets

2013-02-11 14:16:52 -05:00

br_stp_if.c

bridge: Correctly clamp MAX forward_delay when enabling STP

2013-10-17 16:12:15 -04:00

br_stp_timer.c

bridge: fix race with topology change timer

2013-05-03 16:08:58 -04:00

br_stp.c

bridge: Clamp forward_delay when enabling STP

2013-09-12 23:32:14 -04:00

br_sysfs_br.c

bridge: correct the comment for file br_sysfs_br.c

2013-08-07 10:35:06 -07:00

br_sysfs_if.c

bridge: Add a flag to control unicast packet flood.

2013-06-11 02:04:32 -07:00

br_vlan.c

bridge: Fix updating FDB entries when the PVID is applied

2013-10-18 16:02:53 -04:00

br.c

net:bridge: use IS_ENABLED

2011-12-16 15:49:52 -05:00

Kconfig

bridge: Add vlan filtering infrastructure

2013-02-13 19:41:46 -05:00

Makefile

bridge: Add vlan filtering infrastructure

2013-02-13 19:41:46 -05:00