Merge branches 'thermal-core' and 'thermal-intel' into next

Browse source

...

This commit is contained in:

Zhang Rui 2018-05-30 14:54:20 +08:00

parent 7e3c03817f ce7d35fa4e

commit e9ed3ee61a

2 changed files with 7 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/thermal/int340x_thermal/int340x_thermal_zone.c

View file

4

drivers/thermal/int340x_thermal/processor_thermal_device.c

View file