Merge branches 'release', 'ejd', 'sony' and 'wmi' into release
[linux-2.6] / Documentation / thermal /
drwxr-xr-x   ..
-rw-r--r-- 9344 sysfs-api.txt