Skip to content
GitLab
Commit f157f596 authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branch 'cpu-package-thermal' of .git into next 

Conflicts:
	drivers/thermal/Kconfig
	drivers/thermal/Makefile
parents 30072fb9 23be63f4
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment