Merge remote-tracking branch 'mac80211/master' into HEAD
authorJohannes Berg <[email protected]>
Fri, 4 Dec 2015 13:43:05 +0000 (14:43 +0100)
committerJohannes Berg <[email protected]>
Fri, 4 Dec 2015 13:43:05 +0000 (14:43 +0100)
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 <[email protected]>

Trivial merge