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)
commit36efee8e9ccb60ddff95e4e9be6dab3c21b9a334
tree7c372dba3ba71bcdb37a5bc282b890f9bd896e19
parentc72fc9093718a3f8597249863a1bac345ba00859
parent65dc1a5d1efb0ec54ffb715468070890d27d63fc
Merge ath-current from ath.git