Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:25:04 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:25:04 +0000 (14:25 -0400)
commit0440507bbc44149e63bbfb9df730ba3820371904
tree7275e41aa1aa7e4d19d0503f1c15f07991c1a120
parent8d242488ce4627dd7e6333caab56df11ea25e239
parent7f0d9f430dc99303558adc30a75eef10c43f7bec
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/eeprom_4k.c
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/dvm/testmode.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/ti/wlcore/tx.c
net/mac80211/scan.c