Merge branches 'release' and 'thermal' into release

Browse source

...

This commit is contained in:

Len Brown 2008-03-13 01:59:46 -04:00

parent 1ca721cdb7 5e012760df

commit 160ff06b18

4 changed files with 162 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

22

Documentation/thermal/sysfs-api.txt

View file

12

drivers/acpi/thermal.c

View file

1

drivers/thermal/Kconfig

View file

169

drivers/thermal/thermal.c

View file