From: Johannes Berg Date: Fri, 4 Dec 2015 13:43:05 +0000 (+0100) Subject: Merge remote-tracking branch 'mac80211/master' into HEAD X-Git-Tag: v4.5-rc1~128^2~189^2~37 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d9d3ac7afd7a5349271521fb9693230b4da66f1e;p=linux-block.git Merge remote-tracking branch 'mac80211/master' into HEAD I want to get the full off-channel bugfix since later code depends on it, as well as the AP client state change so I can revert it correctly. Signed-off-by: Johannes Berg --- d9d3ac7afd7a5349271521fb9693230b4da66f1e