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.c
br_device.c
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
br_if.c
br_input.c
br_ioctl.c
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
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
br_private.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-23 16:49:34 -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
br_stp_bpdu.c
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
br_sysfs_br.c
br_sysfs_if.c
br_vlan.c	bridge: Fix updating FDB entries when the PVID is applied	2013-10-18 16:02:53 -04:00
Kconfig
Makefile