Merge remote-tracking branch 'mac80211/master' into mac80211-next
authorJohannes Berg <johannes.berg@intel.com>
Thu, 6 Sep 2012 13:55:50 +0000 (15:55 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 6 Sep 2012 13:56:02 +0000 (15:56 +0200)
Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
drivers/net/wireless/mac80211_hwsim.c

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1  2 
drivers/net/wireless/mac80211_hwsim.c
include/net/cfg80211.h
net/mac80211/cfg.c
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/scan.c
net/mac80211/tx.c
net/wireless/nl80211.c
net/wireless/reg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge