p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/drivers/net/wireless
History
David S. Miller 909b27f706 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The nf_conntrack_core.c fix in 'net' is not relevant in 'net-next'
because we no longer have a per-netns conntrack hash.

The ip_gre.c conflict as well as the iwlwifi ones were cases of
overlapping changes.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/tx.c
	net/ipv4/ip_gre.c
	net/netfilter/nf_conntrack_core.c

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2016-05-15 13:32:48 -04:00
..
admtek cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ath Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-04 00:52:29 -04:00
atmel cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
broadcom brcm80211: correct speed testing 2016-05-03 15:49:34 -04:00
cisco treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
intel Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-05-15 13:32:48 -04:00
intersil treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
marvell treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
mediatek cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ralink rt2800lib: enable MFP if hw crypt is disabled 2016-04-26 12:30:43 +03:00
realtek wireless-drivers patches for 4.7 2016-05-03 00:35:16 -04:00
rsi cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
st cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
ti cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
zydas treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00
Kconfig mac80211_hwsim: move Kconfig entry for sorting alphabetically 2015-11-18 15:23:36 +02:00
Makefile ath: unify Kconfig with other vendors 2015-11-18 14:28:31 +02:00
mac80211_hwsim.c drivers/wireless: use nla_put_u64_64bit() 2016-04-26 12:00:48 -04:00
mac80211_hwsim.h drivers/wireless: use nla_put_u64_64bit() 2016-04-26 12:00:48 -04:00
ray_cs.c ray_cs: Change 1 to true for bool type variable. 2015-06-02 23:30:14 +03:00
ray_cs.h
…
rayctl.h
…
rndis_wlan.c cfg80211: remove enum ieee80211_band 2016-04-12 15:56:15 +02:00
wl3501.h
…
wl3501_cs.c treewide: replace dev->trans_start update with helper 2016-05-04 14:16:49 -04:00