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

Merge branch 'thermal' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into next 

Conflicts:
	drivers/thermal/cpu_cooling.c
parents 2fd1db88 bbf7fc88
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