diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-11 15:09:30 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-09-11 15:09:30 +0200 |
commit | d2be8992df5d113a57374b7f654d667b8f9b32f4 (patch) | |
tree | 7f49093c79e0abe1f5c88e86e911e484d2dcde44 /drivers/acpi | |
parent | Merge branch 'pm-cpufreq' (diff) | |
parent | ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses (diff) | |
parent | ACPI / LPSS: complete PM entries for LPSS power domain (diff) | |
parent | Revert "ACPI / battery: fix wrong value of capacity_now reported when fully c... (diff) | |
download | linux-d2be8992df5d113a57374b7f654d667b8f9b32f4.tar.xz linux-d2be8992df5d113a57374b7f654d667b8f9b32f4.zip |
Merge branches 'acpi-rtc', 'acpi-lpss' and 'acpi-battery'
* acpi-rtc:
ACPI / RTC: Fix CMOS RTC opregion handler accesses to wrong addresses
* acpi-lpss:
ACPI / LPSS: complete PM entries for LPSS power domain
* acpi-battery:
Revert "ACPI / battery: fix wrong value of capacity_now reported when fully charged"
Revert "ACPI / battery: Fix warning message in acpi_battery_get_state()"