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

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

Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)

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

Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)
author John W. Linville <linville@tuxdriver.com>
Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)
committer John W. Linville <linville@tuxdriver.com>
Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)
diff --cc drivers/net/wireless/brcm80211/brcmfmac/usb.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 30 May 2012 14:32:16 +0000 (10:32 -0400)