Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Mar 2012 17:45:25 +0000 (13:45 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Mar 2012 17:45:25 +0000 (13:45 -0400)
commit01a282980937f9ca55a3cb06b9c6ff1cc49ea396
tree07a043edc861e245a7a9764751af0898a1f1199a
parentd5ddb4a59ed43b4c569b4efa8b508d50ef140cc6
parent377526578f2c343ea281a918b18ece1fca65005c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
drivers/net/wireless/mwifiex/pcie.c
drivers/net/wireless/mwifiex/sdio.c