David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
b43	b43: Fix firmware loading when driver is built into the kernel	2013-01-07 14:34:45 -05:00
b43legacy	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-12-11 16:24:55 -05:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
hostap	wireless: drivers: make use of WLAN_EID_VENDOR_SPECIFIC	2012-10-18 09:01:54 +02:00
ipw2x00	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
iwlegacy	drivers/net/wireless/iwlegacy: use strlcpy instead of strncpy	2013-01-07 14:34:45 -05:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
libertas	libertas: remove __dev* attributes	2012-12-06 15:04:57 -05:00
libertas_tf	mac80211: move TX station pointer and restructure TX	2012-07-31 16:18:39 +02:00
mwifiex	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
orinoco	remove init of dev->perm_addr in drivers	2013-01-08 18:00:48 -08:00
p54	p54usb: add USBIDs for two more p54usb devices	2013-01-02 14:38:30 -05:00
prism54
rt2x00	rt2x00: zero-out rx_status	2012-12-17 15:45:17 -05:00
rtl818x	rtl8187: remove __dev* attributes	2012-12-06 15:04:59 -05:00
rtlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2013-01-09 11:01:37 -05:00
ti	net: use ETHTOOL_FWVERS_LEN instead of ETHTOOL_BUSINFO_LEN for fw_ver strings	2013-01-06 21:06:31 -08:00
zd1211rw	treewide: fix typo of "suppport" in various comments	2012-11-19 14:13:52 +01:00
adm8211.c	wireless: remove __dev* attributes	2012-12-06 15:04:55 -05:00
adm8211.h
airo_cs.c
airo.c	wireless: remove __dev* attributes	2012-12-06 15:04:55 -05:00
airo.h
at76c50x-usb.c	wireless: Convert dev_printk(KERN_<LEVEL> to dev_<level>(	2012-11-14 14:55:32 -05:00
at76c50x-usb.h
atmel_cs.c
atmel_pci.c	atmel: remove __dev* attributes	2012-12-06 15:04:56 -05:00
atmel.c	treewide: fix typo of "suport" in various comments and Kconfig	2012-11-19 14:16:09 +01:00
atmel.h
Kconfig	drivers: remove reference to feature-removal-schedule.txt	2012-12-17 17:15:12 -08:00
mac80211_hwsim.c	wireless: fix VHT max AMPDU exponent definition	2012-12-06 14:02:51 +01:00
mac80211_hwsim.h
Makefile	wireless: fix Atheros drivers compilation	2012-12-17 15:48:43 -05:00
mwl8k.c	drivers/net/wireless/mwl8k.c: avoid use-after-free	2013-01-07 14:34:44 -05:00
ray_cs.c
ray_cs.h
rayctl.h
rndis_wlan.c	cfg80211: pass a channel definition struct	2012-11-26 12:42:58 +01:00
wl3501_cs.c	wl3501_cs: use is_broadcast_ether_addr() instead of memcmp()	2012-09-07 15:03:40 -04:00
wl3501.h
zd1201.c
zd1201.h