diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-10 21:03:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-10 21:03:25 +0200 |
| commit | 4488c99b6397ab7db14c9ffeb8e94f3fca5dbb19 (patch) | |
| tree | 60c79899a04f2e4e8d731b7ec788623310d88547 /drivers | |
| parent | 867f9d463b82462793ea4610e748be0b04b37fc7 (diff) | |
| parent | e63f6e28dda6de3de2392ddca321e211fd860925 (diff) | |
| parent | c128c776e0f45d3edaf44ab3fecfa5d1f7067c07 (diff) | |
| parent | 232de514379082e7ec431c66c9713a6ef23d5dcb (diff) | |
| download | linux-4488c99b6397ab7db14c9ffeb8e94f3fca5dbb19.tar.bz2 | |
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