Merge branch 'power-meter' into release

Browse source

...

This commit is contained in:

Len Brown 2009-09-19 02:10:22 -04:00

parent 89ae400e3f de584afa5e

commit 44396a2622

4 changed files with 1081 additions and 0 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

51

Documentation/hwmon/acpi_power_meter

View file

11

drivers/acpi/Kconfig

View file

1

drivers/acpi/Makefile

View file

1018

drivers/acpi/power_meter.c

View file