David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
ath	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
b43	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-09-07 15:07:55 -04:00
b43legacy	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-08-21 16:00:21 -04:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
hostap	wireless: use is_broadcast_ether_addr() instead of memcmp()	2012-09-07 15:03:39 -04:00
ipw2x00	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-09-07 15:07:55 -04:00
iwlegacy	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2012-08-21 16:00:21 -04:00
iwlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
libertas	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-14 13:53:49 -04:00
libertas_tf	mac80211: move TX station pointer and restructure TX	2012-07-31 16:18:39 +02:00
mwifiex	mwifiex: separate TxPD processing routine for AP	2012-09-11 15:31:58 -04:00
orinoco	orinoco: use is_zero_ether_addr() instead of memcmp()	2012-09-07 15:03:37 -04:00
p54	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-14 13:53:49 -04:00
prism54	wireless: Remove casts to same type	2012-06-06 09:31:33 -07:00
rt2x00	rt2x00: add MediaTek/RaLink Rt3352 WiSoC	2012-09-11 15:13:50 -04:00
rtl818x	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-08-24 12:25:30 -04:00
rtlwifi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
ti	wl18xx: remove duplicated include from main.c	2012-09-07 15:03:40 -04:00
zd1211rw	zd1211rw: enable support for MFP	2012-09-11 15:13:50 -04:00
adm8211.c	mac80211: move TX station pointer and restructure TX	2012-07-31 16:18:39 +02:00
adm8211.h
airo.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2012-09-14 13:53:49 -04: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: eliminate hex2str()	2012-09-11 15:13:53 -04:00
at76c50x-usb.h
atmel.c	wireless: Remove casts to same type	2012-06-06 09:31:33 -07: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	iwmc3200wifi: remove driver for unavailable hardware	2012-07-10 12:16:32 -04:00
mac80211_hwsim.c	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
mac80211_hwsim.h
Makefile	iwmc3200wifi: remove driver for unavailable hardware	2012-07-10 12:16:32 -04:00
mwl8k.c	mac80211: move TX station pointer and restructure TX	2012-07-31 16:18:39 +02:00
ray_cs.c	wireless: Remove casts to same type	2012-06-06 09:31:33 -07:00
ray_cs.h
rayctl.h
rndis_wlan.c	rndis_wlan: remove pointless check from rndis_scan()	2012-09-11 15:31:44 -04:00
wl3501.h
wl3501_cs.c	wl3501_cs: use is_broadcast_ether_addr() instead of memcmp()	2012-09-07 15:03:40 -04:00
zd1201.c	USB: Disable hub-initiated LPM for comms devices.	2012-05-18 15:42:55 -07:00
zd1201.h