Merge ath-next from ath.git
authorKalle Valo <kvalo@codeaurora.org>
Mon, 25 May 2015 12:12:21 +0000 (15:12 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Mon, 25 May 2015 12:12:21 +0000 (15:12 +0300)
Major changes:

ath10k:

* qca6174 power consumption improvements, enable ASPM etc (Michal)

wil6210:

* support Wi-Fi Simple Configuration in STA mode

1  2 
drivers/net/wireless/ath/ath10k/mac.c

Simple merge