Merge ath-next from ath.git
authorKalle Valo <kvalo@codeaurora.org>
Thu, 7 Jan 2016 20:54:46 +0000 (22:54 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 7 Jan 2016 20:54:46 +0000 (22:54 +0200)
No major changes to list.


Trivial merge