David S. Miller dc25b25897 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c Overlapping additions of new device IDs to qmi_wwan.c Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-21 11:44:04 -07:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c	mac80211: remove ieee80211_aes_cmac_calculate_k1_k2()	2015-08-13 11:31:45 +02:00
aes_cmac.h
aes_gcm.c
aes_gcm.h
aes_gmac.c
aes_gmac.h
agg-rx.c
agg-tx.c
cfg.c	mac80211: add rate mask logic for vht rates	2015-08-14 17:49:51 +02:00
cfg.h
chan.c	mac80211: upgrade BW of TDLS peers when possible	2015-07-17 15:38:12 +02:00
debug.h
debugfs_key.c	mac80211: remove key TX/RX counter	2015-07-17 15:38:01 +02:00
debugfs_key.h
debugfs_netdev.c	mac80211: add rate mask logic for vht rates	2015-08-14 17:49:51 +02:00
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
debugfs.c	mac80211: define TDLS wider BW support bits	2015-07-17 15:38:11 +02:00
debugfs.h
driver-ops.c	mac80211: deinline drv_sta_state	2015-07-17 15:48:50 +02:00
driver-ops.h	mac80211: deinline drv_sta_state	2015-07-17 15:48:50 +02:00
ethtool.c
event.c
ht.c
ibss.c
ieee80211_i.h	mac80211: add rate mask logic for vht rates	2015-08-14 17:49:51 +02:00
iface.c	mac80211: add rate mask logic for vht rates	2015-08-14 17:49:51 +02:00
Kconfig	mac80211: use DECLARE_EWMA	2015-08-14 17:49:53 +02:00
key.c	mac80211: remove sta_info.gtk_idx	2015-07-17 15:37:54 +02:00
key.h	mac80211: remove key TX/RX counter	2015-07-17 15:38:01 +02:00
led.c
led.h
main.c	mac80211: TDLS: handle chan-switch in RTNL locked work	2015-07-17 15:40:15 +02:00
Makefile	mac80211: deinline drv_sta_state	2015-07-17 15:48:50 +02:00
mesh_hwmp.c	mac80211: mesh: move fail_avg into mesh struct	2015-07-17 15:38:24 +02:00
mesh_pathtbl.c
mesh_plink.c	mac80211: use DECLARE_EWMA	2015-08-14 17:49:53 +02:00
mesh_ps.c	mac80211: mesh: separate plid and aid concepts	2015-07-17 15:47:11 +02:00
mesh_sync.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
mesh.c	mac80211: move mesh related station fields to own struct	2015-07-17 15:38:06 +02:00
mesh.h
michael.c
michael.h
mlme.c	mac80211: Add support for declaring MU-MIMO capability	2015-07-17 15:38:29 +02:00
ocb.c	mac80211: Make OCB mode set BSSID	2015-08-14 17:49:49 +02:00
offchannel.c
pm.c	mac80211: wowlan: enable powersave if suspend while ps-polling	2015-07-17 11:13:21 +02:00
rate.c	mac80211: add rate mask logic for vht rates	2015-08-14 17:49:51 +02:00
rate.h	mac80211: deinline rate_control_rate_init, rate_control_rate_update	2015-07-17 15:50:02 +02:00
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c	mac80211: minstrel_ht: handle peers in dynamic SMPS	2015-07-17 15:38:20 +02:00
rc80211_minstrel_ht.h
rc80211_minstrel.c	mac80211: fix invalid read in minstrel_sort_best_tp_rates()	2015-08-13 13:52:34 +02:00
rc80211_minstrel.h
rx.c	mac80211: use DECLARE_EWMA	2015-08-14 17:49:53 +02:00
scan.c
spectmgmt.c
sta_info.c	mac80211: use DECLARE_EWMA	2015-08-14 17:49:53 +02:00
sta_info.h	mac80211: use DECLARE_EWMA	2015-08-14 17:49:53 +02:00
status.c	mac80211: remove always true condition	2015-08-13 11:36:01 +02:00
tdls.c	mac80211: TDLS: deny ch-switch req on disallowed channels	2015-07-17 15:40:35 +02:00
tkip.c
tkip.h
trace_msg.h
trace.c
trace.h
tx.c	mac80211: Set txrc.bss to true for OCB interfaces	2015-08-14 17:49:48 +02:00
util.c	mac80211: clear local->suspended before calling drv_resume()	2015-07-17 15:40:46 +02:00
vht.c	mac80211: add rate mask logic for vht rates	2015-08-14 17:49:51 +02:00
wep.c
wep.h
wme.c
wme.h
wpa.c	mac80211: support device/driver PN check for CCMP/GCMP	2015-07-17 15:38:02 +02:00
wpa.h