From: Kalle Valo <kvalo@codeaurora.org>
Date: Mon, 25 May 2015 12:12:21 +0000 (+0300)
Subject: Merge ath-next from ath.git
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~134^2~139^2~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d36f46b4e61ae7bd2ce013317cb3ca0298bbb6e;p=pandora-kernel.git

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

1d36f46b4e61ae7bd2ce013317cb3ca0298bbb6e
Reading git-diff-tree failed