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)
commit0f62248501cbf5047486601d7e39d5ee36d478c2
tree66119712683a8e1d4d4339d72864ceeb7e1806f0
parentb8d9e572cb8794335fb4ba63ff962acaa3c4473b
parent6352c87ff69daa2211419ec2c34ddb8bc116c505
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c