projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ba4435 c1df932)
Merge remote-tracking branch 'mac80211/master' into HEAD
authorJohannes Berg <johannes.berg@intel.com>
Fri, 4 Dec 2015 13:43:05 +0000 (14:43 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 4 Dec 2015 13:43:05 +0000 (14:43 +0100)
commitd9d3ac7afd7a5349271521fb9693230b4da66f1e
tree59f1a146ba05e228bc7f9cd8ac02b478f6a59ab9tree | snapshot
parent0ba44351025f8f6aa279a7e4feb5e23429801c10commit | diff
parentc1df932c0574c13ab3ce72e969c9647ff3aaad68commit | diff
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 <johannes.berg@intel.com>
Unnamed repository; edit this file 'description' to name the repository.