Re: pull-request: mac80211-next 2016-10-04

From: Johannes Berg <redacted>
Date: Tue,  4 Oct 2016 09:31:28 +0200

Here's a version with the conflicts resolved - had to jigger some
code around, but it's all described in the merge commit message.

Let me know if there's any problem.

Pulled, thanks for resolving this.