Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

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

Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)

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

Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)
author John W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)
committer John W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)
diff --cc drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
Simple merge
author	John W. Linville <linville@tuxdriver.com>
	Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)