Merge branch 'thermal' into release

Browse source

...

This commit is contained in:

Len Brown 2011-01-12 05:00:44 -05:00

parent c1b2dab96f 4cb1872870

commit 77cff3b0d6

5 changed files with 151 additions and 1 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

4

Documentation/ABI/stable/thermal-notification

View file

12

Documentation/thermal/sysfs-api.txt

View file

1

drivers/thermal/Kconfig

View file

103

drivers/thermal/thermal_sys.c

View file

32

include/linux/thermal.h

View file