From: Johannes Berg Date: Wed, 7 Jan 2015 13:39:02 +0000 (+0100) Subject: Merge branch 'mac80211' into mac80211-next X-Git-Tag: v4.0-rc1~133^2~206^2~24 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3a4b0c948d286523ba062985c03487b55326eaae;p=users%2Fdwmw2%2Flinux.git Merge branch 'mac80211' into mac80211-next Merge mac80211.git to get some changes that would otherwise cause conflicts with new changes coming here. Signed-off-by: Johannes Berg --- 3a4b0c948d286523ba062985c03487b55326eaae