From: Johannes Berg 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~30^2~48^2~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=944b9e375d89271c39995d363f62cb91734fae5f;p=platform%2Fkernel%2Flinux-exynos.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 --- 944b9e375d89271c39995d363f62cb91734fae5f