Merge branch 'scsi-fixes' into merge-base
[linux-2.6] / drivers / thermal /
drwxr-xr-x   ..
-rw-r--r-- 749 Kconfig
-rw-r--r-- 81 Makefile
-rw-r--r-- 31904 thermal_sys.c