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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

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

2013-08-26 16:37:08 -04:00

..

netfilter

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

2013-06-06 01:03:06 -07:00

br_device.c

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

2013-08-03 21:36:46 -07:00

br_fdb.c

bridge: Use the correct bit length for bitmap functions in the VLAN code

2013-08-20 23:35:57 -07: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: cleanup netpoll code

2013-07-26 15:24:32 -07:00

br_input.c

bridge: disable snooping if there is no querier

2013-07-31 17:40:21 -07: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

bridge: fix rcu check warning in multicast port group

2013-08-04 18:41:52 -07:00

br_multicast.c

bridge: don't try to update timers in case of broken MLD queries

2013-08-05 15:43:39 -07:00

br_netfilter.c

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

br_netlink.c

bridge: Use the correct bit length for bitmap functions in the VLAN code

2013-08-20 23:35:57 -07:00

br_notify.c

net: convert resend IGMP to notifier event

2013-07-23 16:52:47 -07:00

br_private_stp.h

net: cleanup unsigned to unsigned int

2012-04-15 12:44:40 -04:00

br_private.h

bridge: fix rcu check warning in multicast port group

2013-08-04 18:41:52 -07:00

br_stp_bpdu.c

bridge: set priority of STP packets

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

br_stp_if.c

bridge: make user modified path cost sticky

2013-04-15 14:03:44 -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: avoid OOPS if root port not found

2013-04-30 15:51:08 -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: Use the correct bit length for bitmap functions in the VLAN code

2013-08-20 23:35:57 -07: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