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)
commitd2be8992df5d113a57374b7f654d667b8f9b32f4
tree7f49093c79e0abe1f5c88e86e911e484d2dcde44
parent1c00f73c8361fa26e3d28e93fb922a6aa958739c
parent9389f46e9782ea5e56fbd7b2e59ba7c08f3ba86b
parentf4168b617ac09986c4333accaff5d8ba5a9db7bf
parent508b3c677601797f2d51df3df5caa436dd235cb9
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()"