leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93040ae5cc
linux/drivers/net/wireless
History
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -07:00
..
ath Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
b43 b43: do not call ieee80211_unregister_hw if we are not registred 2012-06-08 13:47:06 -04:00
b43legacy Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-12 14:25:04 -04:00
brcm80211 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-19 14:41:22 -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 iwl4965: claim RSN IBSS support 2012-06-06 15:18:18 -04:00
iwlwifi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
iwmc3200wifi
libertas Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2012-06-12 14:25:04 -04:00
libertas_tf wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
mwifiex Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
orinoco cfg80211: clarify set_channel APIs 2012-06-06 15:18:17 -04:00
p54 wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
prism54 wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
rt2x00 rt2x00:Add RT5392 chipset support 2012-06-06 15:19:00 -04:00
rtl818x rtl8187: ->brightness_set can not sleep 2012-06-08 13:43:57 -04:00
rtlwifi wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
ti Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
zd1211rw wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
adm8211.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
adm8211.h
airo_cs.c
airo.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-25 15:50:32 -07:00
airo.h
at76c50x-usb.c
at76c50x-usb.h
atmel_cs.c
atmel_pci.c
atmel.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
atmel.h
Kconfig
mac80211_hwsim.c mac80211_hwsim: Set IEEE80211_STAT_ACK flag when userspace indicates that the frame has been acknowledged. 2012-06-08 13:43:58 -04:00
mac80211_hwsim.h
Makefile
mwl8k.c
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: fix matching bssid check in rndis_check_bssid_list() 2012-06-11 14:29:15 -04:00
wl3501_cs.c
wl3501.h
zd1201.c
zd1201.h