Merge branch 'thermal-2.6.33' into release

Browse source

...

This commit is contained in:

Len Brown 2009-12-15 22:35:50 -05:00

parent abdef01dac 3767cb54ac

commit 1667e399a4

3 changed files with 19 additions and 6 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

1

Documentation/thermal/sysfs-api.txt

View file

7

drivers/acpi/thermal.c

View file

17

drivers/thermal/thermal_sys.c

View file