From: Kalle Valo <kvalo@codeaurora.org>
Date: Thu, 7 Apr 2016 18:44:37 +0000 (+0300)
Subject: Merge ath-next from ath.git
X-Git-Tag: v4.7-rc1~154^2~319^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=20ac1b325d8d526211b1276ecf9b64b7e8369f50;p=users%2Fwilly%2Flinux.git

Merge ath-next from ath.git

ath.git patches for 4.7. Major changes:

ath10k

* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)

wil6210

* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter
---

20ac1b325d8d526211b1276ecf9b64b7e8369f50