John W. Linville 812fd64596 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next ... Conflicts: drivers/net/wireless/iwlwifi/mvm/mac80211.c		2013-06-12 15:39:05 -04:00
..
wl12xx	wl12xx/wl18xx: scan all 5ghz channels	2013-06-12 10:20:57 -04:00
wl18xx	wl12xx/wl18xx: scan all 5ghz channels	2013-06-12 10:20:57 -04:00
wl1251	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem	2013-04-24 10:54:20 -04:00
wlcore	cfg80211: take WoWLAN support information out of wiphy struct	2013-06-03 18:43:34 +02:00
Kconfig	wlcore: move wl12xx_platform_data up and make it truly optional	2013-02-08 10:05:02 +02:00
Makefile	wlcore: move wl12xx_platform_data up and make it truly optional	2013-02-08 10:05:02 +02:00
wilink_platform_data.c	wlcore: move wl12xx_platform_data up and make it truly optional	2013-02-08 10:05:02 +02:00