-
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville authored
Conflicts: drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/mwifiex/cfg80211.c
d07d1528
Conflicts: drivers/net/wireless/iwmc3200wifi/cfg80211.c drivers/net/wireless/mwifiex/cfg80211.c