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
..
ath	As we get closer to the merge window, here are a few	2015-05-31 17:34:26 -07:00
b43	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
b43legacy	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
cw1200	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
hostap	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ipw2x00	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
iwlegacy	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
libertas	cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect	2015-05-26 15:21:27 +02:00
libertas_tf	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
mwifiex	As we get closer to the merge window, here are a few	2015-05-31 17:34:26 -07:00
orinoco	Lots of updates for net-next; along with the usual flurry	2015-03-31 16:39:04 -04:00
p54	mac80211: make LED trigger names const	2015-05-05 14:21:55 +02:00
prism54
rsi
rt2x00	mac80211: extend get_tkip_seq to all keys	2015-05-06 13:29:59 +02:00
rtl818x
rtlwifi	ath10k:	2015-05-24 23:23:01 -04:00
ti	ath10k:	2015-05-24 23:23:01 -04:00
zd1211rw	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
adm8211.c	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
adm8211.h
airo_cs.c
airo.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-04-15 09:00:47 -07:00
airo.h
at76c50x-usb.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
at76c50x-usb.h	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
atmel_cs.c
atmel_pci.c
atmel.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
atmel.h
Kconfig
mac80211_hwsim.c	mac80211_hwsim: Fix the supported VHT mcs rates	2015-05-06 14:51:27 +02:00
mac80211_hwsim.h
Makefile
mwl8k.c	mac80211: remove support for IFF_PROMISC	2015-04-24 11:14:13 +02:00
ray_cs.c	wireless: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
ray_cs.h
rayctl.h
rndis_wlan.c	cfg80211: properly send NL80211_ATTR_DISCONNECTED_BY_AP in disconnect	2015-05-26 15:21:27 +02:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h