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)
ath10k

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

wil6210

* new maintainer - Maya Erez

1  2 
MAINTAINERS
drivers/net/wireless/ath/ath10k/core.h

diff --cc MAINTAINERS
Simple merge