diff options
author | 2015-11-06 09:32:10 +0800 | |
---|---|---|
committer | 2015-11-06 09:32:10 +0800 | |
commit | 7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30 (patch) | |
tree | 50cd98e26a1e426e7433c68ea257beb241d7fc62 /tools/perf/scripts/python/syscall-counts.py | |
parent | tools/thermal: tmon: use pkg-config also for CFLAGS (diff) | |
parent | thermal: kconfig: select THERMAL_WRITABLE_TRIPS for x86 thermal (diff) | |
parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc (diff) | |
download | linux-dev-7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30.tar.xz linux-dev-7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30.zip |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next