Merge branch 'x86/cpu' into x86/core
[linux-2.6] / drivers / thermal /
drwxr-xr-x   ..
-rw-r--r-- 749 Kconfig
-rw-r--r-- 81 Makefile
-rw-r--r-- 23582 thermal_sys.c