Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:05 +0000 (15:21 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 12 Jul 2012 19:21:05 +0000 (15:21 -0400)
commitd07d152892aadd8dc3209ecef6788dfc83475676
tree0f140aa244ddc2c52494155342298cef64fc8456
parent2f8684ce7a47c91da7e0ccba2686277c103d02b6
parent685fb72b63faf09a767cc28332545f5830b91be8
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

Conflicts:
drivers/net/wireless/iwmc3200wifi/cfg80211.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/iwlegacy/common.c
drivers/net/wireless/mwifiex/cfg80211.c
drivers/net/wireless/mwifiex/main.h
net/mac80211/mlme.c
net/mac80211/rc80211_minstrel_ht.c
net/mac80211/rx.c