Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git] / Documentation / thermal / sysfs-api.txt
Simple merge