David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/bonding/bond_3ad.h drivers/net/bonding/bond_main.c Two minor conflicts in bonding, both of which were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-02-19 01:24:22 -05:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-02-19 01:24:22 -05:00
b43	b43: fix the wrong assignment of status.freq in b43_rx()	2014-01-23 14:02:45 -05:00
b43legacy	b43legacy: Fix unload oops if firmware is not available	2014-01-13 14:50:03 -05:00
brcm80211	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
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: fix "hostap: proc: Use remove_proc_subtree()"	2014-02-13 14:58:12 -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	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05:00
iwlwifi	iwlwifi: disable TX AMPDU by default for iwldvm	2014-02-13 15:24:35 +02:00
libertas	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-01-25 11:17:34 -08:00
libertas_tf
mwifiex	netdevice: add queue selection fallback handler for ndo_select_queue	2014-02-17 00:36:34 -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	rt2500: disable PS by default	2014-02-04 15:30:07 -05:00
rtl818x	rtl8187: fix regression on MIPS without coherent DMA	2014-02-13 14:58:12 -05:00
rtlwifi	rtlwifi: Fix incorrect return from rtl_ps_enable_nic()	2014-02-13 14:58:12 -05:00
ti	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
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.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	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
mac80211_hwsim.h	mac80211_hwsim: restore regulatory testing functionality	2014-01-10 20:12:59 +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	wireless: delete non-required instances of include <linux/init.h>	2014-01-03 15:37:01 -05: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
zd1201.h