Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

author John W. Linville <linville@tuxdriver.com>

Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)

committer John W. Linville <linville@tuxdriver.com>

Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
author John W. Linville <linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
committer John W. Linville <linville@tuxdriver.com>
Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
diff --cc drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
Simple merge
diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 19 Jun 2012 18:41:22 +0000 (14:41 -0400)
		1	2
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	patch \|	diff1 \|	diff2 \|	blob \| history