David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

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

2014-01-06 17:37:45 -05:00

..

netfilter

bridge: change the position of '{' to the pre line

2013-12-19 19:27:26 -05:00

br_device.c

net: unify the pcpu_tstats and br_cpu_netstats as one

2014-01-04 20:10:24 -05:00

br_fdb.c

bridge: remove unnecessary condition judgment

2013-12-19 19:27:25 -05:00

br_forward.c

bridge: remove unnecessary parentheses

2013-12-19 19:27:26 -05:00

br_if.c

bridge: spelling fixes

2013-12-18 17:53:22 -05:00

br_input.c

net: unify the pcpu_tstats and br_cpu_netstats as one

2014-01-04 20:10:24 -05:00

br_ioctl.c

bridge: add space before '(/{', after ',', etc.

2013-12-19 19:27:26 -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

bridge: use spin_lock_bh() in br_multicast_set_hash_max

2014-01-06 16:39:47 -05:00

br_netfilter.c

bridge: change "foo* bar" to "foo *bar"

2013-12-19 19:27:26 -05:00

br_netlink.c

netlink: cleanup rntl_af_register

2014-01-01 23:42:19 -05: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

net: unify the pcpu_tstats and br_cpu_netstats as one

2014-01-04 20:10:24 -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

bridge: Correctly clamp MAX forward_delay when enabling STP

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

br_stp_timer.c

bridge: add space before '(/{', after ',', etc.

2013-12-19 19:27:26 -05:00

br_stp.c

bridge: Clamp forward_delay when enabling STP

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

br_sysfs_br.c

bridge: use DEVICE_ATTR_xx macros

2014-01-06 16:40:46 -05:00

br_sysfs_if.c

bridge: change "foo* bar" to "foo *bar"

2013-12-19 19:27:26 -05:00

br_vlan.c

bridge: spelling fixes

2013-12-18 17:53:22 -05: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