Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 18:59:51 +0000 (13:59 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Nov 2012 18:59:51 +0000 (13:59 -0500)
1  2 
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c