Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000 (16:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Aug 2012 20:00:21 +0000 (16:00 -0400)
commit01e17dacd47101ad7d33152bbfbbd4394352d2e6
treed94706b87fcad04d08a46a9b3555396d21ab41ec
parent22c5649eef0fc37532e20c14d2656b28ca708a69
parentdcf33963c48e1959c83fda84e336dbb000eefa3f
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/mac80211_hwsim.c
drivers/net/wireless/ath/ath5k/mac80211-ops.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43legacy/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/mac80211_hwsim.c
net/mac80211/mesh.c
net/mac80211/mesh.h
net/mac80211/mesh_plink.c