Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Jan 2014 20:25:15 +0000 (15:25 -0500)
commit55d1cad2efe2e3567c3116f50ba10e5af1bc01fc
tree5d09fc11643739c5266250383cffbe577a562ee5
parent39731b78b4afebb7501c05b68e2443a1b250b41c
parent32db6b54dfba38aa8fa4072b2a3fc6425139166a
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c