David S. Miller 188d1f76d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/ethtool.c drivers/net/vmxnet3/vmxnet3_drv.c drivers/net/wireless/iwlwifi/dvm/tx.c net/ipv6/route.c The ipv6 route.c conflict is simple, just ignore the 'net' side change as we fixed the same problem in 'net-next' by eliminating cached neighbours from ipv6 routes. The e1000e conflict is an addition of a new statistic in the ethtool code, trivial. The vmxnet3 conflict is about one change in 'net' removing a guarding conditional, whilst in 'net-next' we had a netdev_info() conversion. The iwlwifi conflict is dealing with a WARN_ON() conversion in 'net-next' vs. a revert happening in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-02-05 14:12:20 -05:00
..
ath	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -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-05 14:12:20 -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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-01-28 13:54:03 -05:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-02-05 14:12:20 -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	rt2x00: Improve TX status handling for BlockAckReq frames	2013-01-22 16:01:29 -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-05 14:12:20 -05:00
ti	wireless: Remove unnecessary alloc/OOM messages, alloc cleanups	2013-02-04 13:22:34 -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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-01-28 13:54:03 -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