Skip to content
Commit 6b221b0a authored by Zhang Rui's avatar Zhang Rui
Browse files

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

parents 6b8249ab 11f787b0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment