From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 6 Sep 2012 13:55:50 +0000 (+0200)
Subject: Merge remote-tracking branch 'mac80211/master' into mac80211-next
X-Git-Tag: v3.7-rc1~145^2~31^2^2~67^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=944b9e375d89271c39995d363f62cb91734fae5f;p=thirdparty%2Flinux.git

Merge remote-tracking branch 'mac80211/master' into mac80211-next

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>
---

944b9e375d89271c39995d363f62cb91734fae5f