]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-rtc', 'acpi-lpss' and 'acpi-battery'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 11 Sep 2014 13:09:30 +0000 (15:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 11 Sep 2014 13:09:30 +0000 (15:09 +0200)
* 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()"


Trivial merge