Merge branch 'pxa-ssp' into for-2.6.30
[linux-2.6] / Documentation / thermal /
drwxr-xr-x   ..
-rw-r--r-- 10361 sysfs-api.txt