]> 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)
commitc8d35f507e1ee619df22b06834f489125fadba32
tree07a043edc861e245a7a9764751af0898a1f1199a
parentfcc74e421c5f5d99589432b538d0478337c4825b
parent55179276b01cef59ed8529b264bcf9e396235ce8
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