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)
commitb3c911eeb47d08aada986f769b6a060794dfe9d0
tree212209c15a26006a62da9252efe18f27f16a0a4a
parent43b03f1f6d6832d744918947d185a7aee89d1e0f
parentdaf67ce8cffd148308ae15c25fb06c1fc20c88f1
Merge branch 'master' of git://git./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