David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
aes_ccm.c
aes_ccm.h
aes_cmac.c	mac80211: aes-cmac: switch to shash CMAC driver	2017-02-08 09:19:33 +01:00
aes_cmac.h	mac80211: aes-cmac: switch to shash CMAC driver	2017-02-08 09:19:33 +01:00
aes_gcm.c
aes_gcm.h
aes_gmac.c
aes_gmac.h
agg-rx.c	mac80211: Use setup_timer instead of init_timer	2017-03-06 13:23:05 +01:00
agg-tx.c	mac80211: Use setup_timer instead of init_timer	2017-03-06 13:23:05 +01:00
cfg.c	mac80211: use common code for monitor options in add/change	2017-04-13 13:41:39 +02:00
chan.c
debug.h
debugfs_key.c
debugfs_key.h
debugfs_netdev.c
debugfs_netdev.h
debugfs_sta.c
debugfs_sta.h
debugfs.c	mac80211: check for allocation failure in debugfs code	2017-02-08 10:05:07 +01:00
debugfs.h
driver-ops.c
driver-ops.h
ethtool.c
fils_aead.c	Some more updates:	2017-02-10 14:31:51 -05:00
fils_aead.h
ht.c
ibss.c	mac80211: ibss: Fix channel type enum in ieee80211_sta_join_ibss()	2017-04-18 11:02:35 +02:00
ieee80211_i.h	mac80211: keep a separate list of monitor interfaces that are up	2017-04-18 11:00:13 +02:00
iface.c	My last pull request has been a while, we now have:	2017-04-20 13:54:40 -04:00
Kconfig
key.c
key.h	mac80211: aes-cmac: switch to shash CMAC driver	2017-02-08 09:19:33 +01:00
led.c
led.h
main.c	mac80211: keep a separate list of monitor interfaces that are up	2017-04-18 11:00:13 +02:00
Makefile
mesh_hwmp.c	mac80211: fix mesh fail_avg check	2017-03-06 09:21:46 +01:00
mesh_pathtbl.c	mac80211: Use setup_timer instead of init_timer for mesh path	2017-03-16 10:54:04 +01:00
mesh_plink.c	sched/headers: Prepare to use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>	2017-03-02 08:42:38 +01:00
mesh_ps.c
mesh_sync.c
mesh.c	mac80211: mesh: drop new node with weak power	2017-03-29 10:29:09 +02:00
mesh.h
michael.c
michael.h
mlme.c	mac80211: reject/clear user rate mask if not usable	2017-03-08 14:20:01 +01:00
ocb.c
offchannel.c
pm.c	mac80211: flush delayed work when entering suspend	2017-02-27 14:00:26 +01:00
rate.c	mac80211: Fix clang warning about constant operand in logical operation	2017-04-13 08:27:02 +02:00
rate.h	mac80211: reject/clear user rate mask if not usable	2017-03-08 14:20:01 +01:00
rc80211_minstrel_debugfs.c
rc80211_minstrel_ht_debugfs.c
rc80211_minstrel_ht.c
rc80211_minstrel_ht.h
rc80211_minstrel.c
rc80211_minstrel.h
rx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-04-21 20:23:53 -07:00
scan.c
spectmgmt.c	ieee80211: rename CCFS1/CCFS2 to CCFS0/CCFS1	2017-03-06 09:21:43 +01:00
sta_info.c	mac80211: encode rate type (legacy, HT, VHT) with fewer bits	2017-03-06 09:21:45 +01:00
sta_info.h	mac80211: encode rate type (legacy, HT, VHT) with fewer bits	2017-03-06 09:21:45 +01:00
status.c	First round of fixes - details in the commits:	2017-03-01 15:08:34 -08:00
tdls.c
tkip.c
tkip.h
trace_msg.h
trace.c
trace.h	cfg80211: fix NAN bands definition	2017-02-09 15:17:30 +01:00
tx.c	mac80211: remove ieee80211_tx_rate_control.max_rate_idx	2017-03-07 09:42:12 +01:00
util.c	ieee80211: rename CCFS1/CCFS2 to CCFS0/CCFS1	2017-03-06 09:21:43 +01:00
vht.c
wep.c
wep.h
wme.c
wme.h
wpa.c
wpa.h