Merge branch 'master' into for-2.6.33
[firefly-linux-kernel-4.4.55.git] / Documentation / thermal /
drwxr-xr-x   ..
-rw-r--r-- 10673 sysfs-api.txt