David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-15 00:53:17 -05:00
..
netfilter	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
br_device.c	bridge: Add filtering support for default_pvid	2014-10-05 21:21:37 -04:00
br_fdb.c	net: Do not call ndo_dflt_fdb_dump if ndo_fdb_dump is defined	2015-01-05 22:52:06 -05:00
br_forward.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-01 14:53:27 -04:00
br_if.c	bridge: Add ability to enable TSO	2015-01-12 16:18:09 -05:00
br_input.c	bridge: only provide proxy ARP when CONFIG_INET is enabled	2015-01-14 15:08:02 -05:00
br_ioctl.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_mdb.c	bridge: rename struct bridge_mcast_query/querier	2014-06-10 23:50:46 -07:00
br_multicast.c	bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queries	2014-11-17 12:38:02 +01:00
br_netfilter.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
br_netlink.c	bridge: fix uninitialized variable warning	2015-01-13 16:39:36 -05:00
br_nf_core.c	netfilter: bridge: move br_netfilter out of the core	2014-09-26 18:42:31 +02: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	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
br_stp_bpdu.c	br: fix use of ->rx_handler_data in code executed on non-rx_handler path	2013-12-06 15:41:40 -05:00
br_stp_if.c	net: bridge: add a br_set_state helper function	2014-10-01 22:03:50 -04:00
br_stp_timer.c	net: bridge: add a br_set_state helper function	2014-10-01 22:03:50 -04:00
br_stp.c	bridge: call netdev_sw_port_stp_update when bridge port STP status changes	2014-12-02 20:01:22 -08: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: Add support for IEEE 802.11 Proxy ARP	2014-10-27 19:02:04 -04:00
br_vlan.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
br.c	netfilter: bridge: move br_netfilter out of the core	2014-09-26 18:42:31 +02:00
Kconfig	bridge: Add vlan filtering infrastructure	2013-02-13 19:41:46 -05:00
Makefile	netfilter: bridge: build br_nf_core only if required	2014-09-30 14:07:51 -04:00