David S. Miller 394efd19d5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/netconsole.c net/bridge/br_private.h Three mostly trivial conflicts. The net/bridge/br_private.h conflict was a function signature (argument addition) change overlapping with the extern removals from Joe Perches. In drivers/net/netconsole.c we had one change adjusting a printk message whilst another changed "printk(KERN_INFO" into "pr_info(". Lastly, the emulex change was a new inline function addition overlapping with Joe Perches's extern removals. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-11-04 13:48:30 -05:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-11-04 13:48:30 -05:00
br_device.c	bridge: pass correct vlan id to multicast code	2013-10-29 17:40:08 -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: pass correct vlan id to multicast code	2013-10-29 17:40:08 -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-11-04 13:48:30 -05: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-11-04 13:48:30 -05: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