Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc

Browse source

...

This commit is contained in:

Zhang Rui 2015-06-11 10:55:42 +08:00

parent e26081808e 9a5238a9c6

commit 53daf9383f

29 changed files with 3359 additions and 137 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

39

include/linux/cpu_cooling.h

View file

97

include/linux/thermal.h

View file

58

include/trace/events/thermal.h

View file

87

include/trace/events/thermal_power_allocator.h

View file