Merge branch 'linus' into sched/core
[linux-3.10.git] / Documentation / thermal /
drwxr-xr-x ..
-rw-r--r-- sysfs-api.txt