Merge branches 'thermal-soc-misc' and 'thermal-soc-qoriq' into thermal-soc

This commit is contained in:
Zhang Rui 2019-08-28 21:09:00 +08:00
commit 6b221b0af7
2 changed files with 31 additions and 15 deletions