Merge branches 'dma-debug/fixes' and 'dma-debug/driver-filter' into dma-debug/2.6.31
[linux-2.6] / drivers / thermal /
drwxr-xr-x   ..
-rw-r--r-- 749 Kconfig
-rw-r--r-- 81 Makefile
-rw-r--r-- 31900 thermal_sys.c