Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

Browse source

...

This commit is contained in:

Len Brown 2008-02-07 03:07:03 -05:00

parent 488b5ec871 ad3399c378 7c2670bbb5

commit 877c357e75

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

5

drivers/acpi/battery.c

View file

15

drivers/acpi/sleep/main.c

View file

1

drivers/power/power_supply_sysfs.c

View file

1

include/linux/power_supply.h

View file