From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 10 Jul 2014 19:03:25 +0000 (+0200)
Subject: Merge branches 'acpi-resources', 'acpi-ac', 'acpi-scan' and 'acpi-battery'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4488c99b6397ab7db14c9ffeb8e94f3fca5dbb19;p=linux-beck.git

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

* 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
---

4488c99b6397ab7db14c9ffeb8e94f3fca5dbb19