David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
br_device.c	netfilter: bridge: use rcu hook to resolve br_netfilter dependency	2015-03-10 15:03:02 +01:00
br_fdb.c	bridge: skip fdb add if the port shouldn't learn	2015-05-25 20:29:54 -04:00
br_forward.c	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
br_if.c	bridge: reset bridge mtu after deleting an interface	2015-03-14 19:12:38 -04:00
br_input.c	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04:00
br_ioctl.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
br_mdb.c	bridge/mdb: remove wrong use of NLM_F_MULTI	2015-04-29 14:59:16 -04:00
br_multicast.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
br_netfilter.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-23 01:22:35 -04:00
br_netlink.c	bridge: revert br_dellink change back to original	2015-05-12 18:43:55 -04:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -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_private.h	bridge: change BR_GROUPFWD_RESTRICTED to allow forwarding of LLDP frames	2015-05-05 19:20:28 -04:00
br_stp_bpdu.c	netfilter: Pass socket pointer down through okfn().	2015-04-07 15:25:55 -04: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	bridge: fix lockdep splat	2015-05-22 16:23:56 -04:00
br_stp.c	switchdev: don't use anonymous union on switchdev attr/obj structs	2015-05-13 14:20:59 -04: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: Extend Proxy ARP design to allow optional rules for Wi-Fi	2015-03-05 14:52:23 -05:00
br_vlan.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
br.c	switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/	2015-05-12 18:43:52 -04: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