From: Kalle Valo <kvalo@codeaurora.org>
Date: Tue, 17 Nov 2015 13:56:52 +0000 (+0200)
Subject: Merge ath-current from ath.git
X-Git-Tag: v4.4-rc4~13^2~53^2~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=cecd4cfb540ed627fba81a0c4d92e205ed8314e6;p=karo-tx-linux.git

Merge ath-current from ath.git

ath10k

* fix invalid NSS for 4x4 devices
* add QCA9377 hw1.0 support
* fix QCA6174 regression with CE5 usage

wil6210

* new maintainer - Maya Erez
---

cecd4cfb540ed627fba81a0c4d92e205ed8314e6