David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
b43	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
b43legacy	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
cw1200	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
hostap	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-03-04 13:05:12 -05:00
ipw2x00	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
iwlegacy	iwl4965: disable 8K A-MSDU by default	2014-03-04 13:28:36 -05:00
iwlwifi	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next	2014-03-19 15:14:07 -04:00
libertas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
libertas_tf
mwifiex	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-03-21 14:02:04 -04:00
orinoco	orinoco: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
p54	p54usb: fix leaks at failure path in p54u_probe()	2014-03-14 14:49:13 -04:00
prism54	net: Replace min macro with min_t	2014-03-03 15:35:54 -05:00
rsi	rsi: Add pr_fmt,__printf, fix format & arg mismatch	2014-03-19 15:15:47 -04:00
rt2x00	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-25 20:29:20 -04:00
rtl818x	rtl818x: remove unused conf_erp callback from RF ops struct	2014-03-19 15:15:46 -04:00
rtlwifi	rtlwifi: rtl8723be: Fix array dimension problems	2014-03-13 14:05:40 -04:00
ti	wl1251: use skb_trim to make skb shorter	2014-03-04 13:33:13 -05:00
zd1211rw	zd1211rw: slight optimization of addr compare	2013-12-26 13:31:33 -05:00
adm8211.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-17 14:43:17 -05:00
adm8211.h
airo_cs.c	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05:00
airo.c	airo: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:11:13 -05:00
airo.h
at76c50x-usb.c	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2014-01-13 14:40:59 -05:00
at76c50x-usb.h
atmel_cs.c	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05:00
atmel_pci.c	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05:00
atmel.c	atmel: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:11:13 -05:00
atmel.h	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
Kconfig	rsi: Add RS9113 wireless driver	2014-03-17 13:51:52 -04:00
mac80211_hwsim.c	mac80211_hwsim: allow creation of single-channel radios with chanctx	2014-02-11 13:10:02 +01:00
mac80211_hwsim.h	mac80211_hwsim: allow creation of single-channel radios with chanctx	2014-02-11 13:10:02 +01:00
Makefile	rsi: Add RS9113 wireless driver	2014-03-17 13:51:52 -04:00
mwl8k.c	mwl8k: mwl8k_update_survey can be static	2014-03-06 14:29:58 -05:00
ray_cs.c	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
ray_cs.h
rayctl.h
rndis_wlan.c	rndis_wlan: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
wl3501_cs.c	wl3501_cs: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
wl3501.h
zd1201.c	zd1201: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}	2014-02-28 14:12:36 -05:00
zd1201.h