Merge ath-current from ath.git
authorKalle Valo <kvalo@codeaurora.org>
Tue, 26 Jan 2016 13:41:30 +0000 (15:41 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 26 Jan 2016 13:43:40 +0000 (15:43 +0200)

Trivial merge