David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
b43	b43: use kernel api to replace b43 specific helper function	2014-02-13 15:20:14 -05:00
b43legacy	b43legacy: Fix unload oops if firmware is not available	2014-01-13 14:50:03 -05:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
cw1200	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
hostap	hostap: Do not free priv until timer handler has actually stopped using it	2014-02-20 15:49:07 -05:00
ipw2x00	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-10 10:59:40 -05:00
iwlegacy	mac80211: remove module handling from rate control ops	2014-02-04 21:48:26 +01:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05: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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
orinoco	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05:00
p54	p54: clamp properly instead of just truncating	2014-01-13 14:50:06 -05:00
prism54	wireless: slight optimization of addr compare	2013-12-26 13:31:35 -05:00
rt2x00	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-02-13 14:43:02 -05:00
rtl818x	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-02-20 15:02:02 -05:00
rtlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-02-20 15:02:02 -05:00
ti	wlcore: add support for STA CSA with chan contexts	2014-02-13 15:20:16 -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	wireless: airo: remove unnecessary pci_set_drvdata()	2013-09-26 15:13:42 -04: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	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05:00
atmel.h	drivers/net/wireless: Fix FSF address in file headers	2013-12-11 10:56:20 -05:00
Kconfig
mac80211_hwsim.c	mac80211: remove unused radiotap vendor fields in ieee80211_rx_status	2014-02-06 09:33:46 +01:00
mac80211_hwsim.h	mac80211_hwsim: make P2P-Device support optional	2014-02-04 21:48:27 +01:00
Makefile
mwl8k.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
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	cfg80211: fix channel configuration in IBSS join	2014-02-04 21:58:16 +01:00
wl3501_cs.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2014-01-10 10:59:40 -05:00
wl3501.h
zd1201.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-08-28 10:36:09 -04:00
zd1201.h