David S. Miller b20b378d49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-09-12 15:52:44 -07:00
..
b43	b43: Completely remove support for phy_a	2016-06-16 18:23:18 +03:00
b43legacy	cfg80211: remove enum ieee80211_band	2016-04-12 15:56:15 +02:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-09-12 15:52:44 -07:00
Kconfig	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00
Makefile	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00