android_kernel_motorola_sm6225/drivers/net/wireless
John W. Linville 01e17dacd4 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
	drivers/net/wireless/mac80211_hwsim.c
2012-08-21 16:00:21 -04:00
..
ath 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
b43 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
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 branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-08-21 16:00:21 -04:00
hostap wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
ipw2x00 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07: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 mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
libertas Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-07-20 12:30:48 -04:00
libertas_tf mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
mwifiex mwifiex: use GFP_ATOMIC under spin lock 2012-08-10 15:27:05 -04:00
orinoco nl80211: move scan API to wdev 2012-07-12 12:10:41 +02:00
p54 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
prism54 wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
rt2x00 mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
rtl818x mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
rtlwifi mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
ti mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
zd1211rw mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
adm8211.c mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02:00
adm8211.h
airo.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
airo.h
airo_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
at76c50x-usb.c mac80211: move TX station pointer and restructure TX 2012-07-31 16:18:39 +02: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 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
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 nl80211: move scan API to wdev 2012-07-12 12:10:41 +02:00
wl3501.h
wl3501_cs.c Remove all #inclusions of asm/system.h 2012-03-28 18:30:03 +01:00
zd1201.c USB: Disable hub-initiated LPM for comms devices. 2012-05-18 15:42:55 -07:00
zd1201.h