Merge commit 'v2.6.34-rc6' into core/locking
[pandora-kernel.git] / drivers / thermal /
drwxr-xr-x   ..
-rw-r--r-- 769 Kconfig
-rw-r--r-- 81 Makefile
-rw-r--r-- 32445 thermal_sys.c