linux/drivers/net/wireless/ti
John W. Linville 98d5fac233 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
	drivers/net/wireless/iwlwifi/dvm/tx.c
	drivers/net/wireless/ti/wlcore/sdio.c
	drivers/net/wireless/ti/wlcore/spi.c
2013-02-18 13:47:13 -05:00
..
wl12xx wlcore: remove if_ops from platform_data 2013-02-08 10:05:02 +02:00
wl18xx mac80211: stop toggling IEEE80211_HT_CAP_SUP_WIDTH_20_40 2013-02-15 09:41:30 +01:00
wl1251 mac80211: remove IEEE80211_HW_SCAN_WHILE_IDLE 2013-02-11 18:45:01 +01:00
wlcore Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-02-18 13:47:13 -05: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