David S. Miller 9f6d98c298 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c The bnx2x gso_type setting bug fix in 'net' conflicted with changes in 'net-next' that broke the gso_* setting logic out into a seperate function, which also fixes the bug in question. Thus, use the 'net-next' version. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-12 18:58:28 -05:00
..
ath	drivers: net: Remove remaining alloc/OOM messages	2013-02-08 17:44:39 -05:00
b43	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-01-28 13:54:03 -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-02-08 18:02:14 -05:00
hostap	wireless: drivers: make use of WLAN_EID_VENDOR_SPECIFIC	2012-10-18 09:01:54 +02:00
ipw2x00	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
iwlegacy	iwlegacy: check for dma mapping errors	2013-02-01 14:27:22 -05:00
iwlwifi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-02-08 13:16:17 -05:00
libertas	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
libertas_tf	mac80211: move TX station pointer and restructure TX	2012-07-31 16:18:39 +02:00
mwifiex	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-02-08 13:16:17 -05:00
orinoco	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
p54	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
prism54	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
rt2x00	wireless: rt2x00: rt2800pci add id	2013-02-01 14:27:25 -05:00
rtl818x	rtl8187: remove __dev* attributes	2012-12-06 15:04:59 -05:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-08 18:02:14 -05:00
ti	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-02-08 13:16:17 -05:00
zd1211rw	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
adm8211.c	wireless: remove __dev* attributes	2012-12-06 15:04:55 -05:00
adm8211.h
airo_cs.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
airo.c	wireless: remove __dev* attributes	2012-12-06 15:04:55 -05:00
airo.h
at76c50x-usb.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
at76c50x-usb.h
atmel_cs.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05:00
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	mac80211_hwsim: fix beacon timestamp and mactime	2013-01-11 14:49:58 -05:00
mac80211_hwsim.h
Makefile	wireless: fix Atheros drivers compilation	2012-12-17 15:48:43 -05:00
mwl8k.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-12 18:58:28 -05:00
ray_cs.c	drivers/net/wireless: need consider the not '\0' terminated string.	2013-01-22 16:01:29 -05:00
ray_cs.h
rayctl.h
rndis_wlan.c	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -05: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	USB: Disable hub-initiated LPM for comms devices.	2012-05-18 15:42:55 -07:00
zd1201.h