David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
b43	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
b43legacy	mac80211: remove hw.conf.channel usage where possible	2012-04-13 14:32:50 -04:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
hostap	net/wireless: use module_pci_driver	2012-04-16 14:38:50 -04:00
ipw2x00	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
iwlegacy	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-04-12 13:49:28 -04:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
iwmc3200wifi	drivers/net: iwmc3200 depends on EXPERIMENTAL	2012-04-21 15:28:47 -04:00
libertas	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-26 15:03:48 -04:00
libertas_tf
mwifiex	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-26 15:03:48 -04:00
orinoco	wireless, orinoco: release_firmware() tests for NULL, remove explicit tests before calls	2012-04-12 15:06:08 -04:00
p54	drivers/net: add missing __devexit_p() annotations	2012-04-21 15:28:47 -04:00
prism54	prism54: replace open-coded ARRAY_SIZE with macro	2012-04-12 15:10:47 -04:00
rt2x00	rt2800: add chipset revision RT5390R support	2012-04-23 15:37:42 -04:00
rtl818x	net/wireless: use module_pci_driver	2012-04-16 14:38:50 -04:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
ti	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
zd1211rw	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-03-20 21:12:50 -07:00
adm8211.c	net/wireless: use module_pci_driver	2012-04-16 14:38:50 -04:00
adm8211.h
airo.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
airo.h
airo_cs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
at76c50x-usb.c	wireless, at76c50x:: Don't needlessly test for NULL before calling release_firmware()	2012-04-12 15:06:07 -04:00
at76c50x-usb.h
atmel.c	wireless, atmel: remove pointless test for NULL before release_firmware() call	2012-04-12 15:06:07 -04:00
atmel.h
atmel_cs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
atmel_pci.c	net/wireless: use module_pci_driver	2012-04-16 14:38:50 -04:00
Kconfig	wireless/wl12xx/wl1251: move TI WLAN modules to a common ti subdirectory	2012-04-12 08:43:55 +03:00
mac80211_hwsim.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-04-18 14:27:48 -04:00
mac80211_hwsim.h
Makefile	wireless/wl12xx/wl1251: move TI WLAN modules to a common ti subdirectory	2012-04-12 08:43:55 +03:00
mwl8k.c	net/wireless: use module_pci_driver	2012-04-16 14:38:50 -04:00
ray_cs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
ray_cs.h
rayctl.h
rndis_wlan.c	rndis_wlan: use u8 for key indexes	2012-03-05 15:23:17 -05:00
wl3501.h
wl3501_cs.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
zd1201.c
zd1201.h