]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit14b1129d7544258ecc5b65ffc72a777da369753c
tree07a043edc861e245a7a9764751af0898a1f1199a
parent54b708775bd15f218e5df61ebcb374340d776362
parent7f93cae7bff2cc21391e7ec5fef1ecf8412854d6
Merge branch 'master' of git://git.kernel.org/pub/scm/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