summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorZhang Rui2015-11-06 02:32:10 +0100
committerZhang Rui2015-11-06 02:32:10 +0100
commit7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30 (patch)
tree50cd98e26a1e426e7433c68ea257beb241d7fc62 /drivers/platform
parenttools/thermal: tmon: use pkg-config also for CFLAGS (diff)
parentthermal: kconfig: select THERMAL_WRITABLE_TRIPS for x86 thermal (diff)
parentMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff)
downloadkernel-qcow2-linux-7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30.tar.gz
kernel-qcow2-linux-7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30.tar.xz
kernel-qcow2-linux-7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30.zip
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next