Merge branches 'acpi-resources', 'acpi-ac', 'acpi-scan' and 'acpi-battery'

Browse source

* acpi-resources:
  ACPI / resources: only reject zero length resources based at address zero

* acpi-ac:
  Revert "ACPI / AC: Remove AC's proc directory."

* acpi-scan:
  ACPI / PNP: add soc_button_array device ID to PNP IDs list

* acpi-battery:
  ACPI / battery: fix wrong value of capacity_now reported when fully charged
  ACPI / battery: Retry to get battery information if failed during probing

...

This commit is contained in:

Rafael J. Wysocki 2014-07-10 21:03:25 +02:00

parent 867f9d463b e63f6e28dd c128c776e0 232de51437

commit 4488c99b63

3 changed files with 170 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

132

drivers/acpi/ac.c

View file

2

drivers/acpi/acpi_pnp.c

View file

41

drivers/acpi/battery.c

View file