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)
commit1d36f46b4e61ae7bd2ce013317cb3ca0298bbb6e
treeb330373ae4216c4e4e8da9cd2137154e2b76e78c
parent01b6961410b76af228eb993220024ff6db6ba80c
parent48f4ca34f36bb947d8a7cd4ff8c8e282f14d51e6
Merge ath-next from ath.git

Major changes:

ath10k:

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

wil6210:

* support Wi-Fi Simple Configuration in STA mode
drivers/net/wireless/ath/ath10k/mac.c