linux/net/wireless
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
..
.gitignore
ap.c
chan.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-08-17 17:26:58 -07:00
core.c cfg80211: always notify userspace when wireless netdev is removed 2016-08-11 16:51:42 +02:00
core.h nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
db.txt
debugfs.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
debugfs.h
ethtool.c
genregdb.awk
ibss.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
Kconfig
lib80211_crypt_ccmp.c
lib80211_crypt_tkip.c
lib80211_crypt_wep.c
lib80211.c
Makefile
mesh.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
mlme.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
nl80211.c nl80211: explicitly check enum nl80211_mesh_power_mode 2016-08-11 20:00:37 +02:00
nl80211.h cfg80211: always notify userspace of new wireless netdevs 2016-08-11 16:51:41 +02:00
ocb.c
radiotap.c
rdev-ops.h cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
reg.c cfg80211: make wdev_list accessible to drivers 2016-05-12 11:16:40 +02:00
reg.h cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
regdb.h
scan.c nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
sme.c cfg80211: Allow cfg80211_connect_result() errors to be distinguished 2016-05-31 15:22:15 +02:00
sysfs.c cfg80211: make wdev_list accessible to drivers 2016-05-12 11:16:40 +02:00
sysfs.h
trace.c
trace.h nl80211: support beacon report scanning 2016-07-06 14:51:31 +02:00
util.c cfg80211: identically validate beacon interval for AP/MESH/IBSS 2016-08-11 20:00:36 +02:00
wext-compat.c wext: remove a/b/g/n from SIOCGIWNAME 2016-05-02 22:48:09 +02:00
wext-compat.h
wext-core.c Revert "wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel" 2016-08-08 08:49:50 +02:00
wext-priv.c
wext-proc.c
wext-sme.c
wext-spy.c