]> 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>
Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
commit32d45baea46d773357fe20333fcad0bd99e568d3
tree212209c15a26006a62da9252efe18f27f16a0a4a
parentff42ebc763e3c460d6e8ca7a4e2e6a703e3af8b8
parentd9ff24a7b6d3d28b9f7273a64fa514d379cd6a15
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/testmode.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/iwlwifi/pcie/trans.c