Merge branches 'battery', 'bugzilla-14667', 'bugzilla-15096', 'bugzilla-15480', ...
[safe/jmp/linux-2.6] / Documentation / thermal /
drwxr-xr-x   ..
-rw-r--r-- 10722 sysfs-api.txt