Merge ath-current from ath.git
authorKalle Valo <kvalo@codeaurora.org>
Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 17 Nov 2015 13:56:52 +0000 (15:56 +0200)
commitcecd4cfb540ed627fba81a0c4d92e205ed8314e6
tree8fab518fea6db966404c7784d0666817252c10b0
parent948cca9fc3052be86d937bcb74170215b38117e8
parent6419fdbb6f90e147690f8833cba59d289d613da5
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
MAINTAINERS
drivers/net/wireless/ath/ath10k/core.h