diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:09:41 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 23:09:41 +0200 |
| commit | 26f8784e2d7b9294399ce8f8b276beeb40201345 (patch) | |
| tree | 7bd6c621fdebc91be059bcfab1690bca02b02615 /arch | |
| parent | 4db367fd095d278dd92158e4b6ae7a737926d30b (diff) | |
| parent | 8da8373447d6a57a5a9f55233d35beb15d92d0d2 (diff) | |
| parent | 4ff248f3bf830ba22c988abb099e1836fbd3b1d0 (diff) | |
| download | linux-26f8784e2d7b9294399ce8f8b276beeb40201345.tar.gz linux-26f8784e2d7b9294399ce8f8b276beeb40201345.tar.bz2 linux-26f8784e2d7b9294399ce8f8b276beeb40201345.zip | |
Merge branches 'acpi-processor' and 'acpi-pad'
* acpi-processor:
ACPI / processor: Fix STARTING/DYING action in acpi_cpu_soft_notify()
ACPI / processor: Check if LAPIC is present during initialization
ACPI / ia64: introduce variable acpi_lapic into ia64
* acpi-pad:
ACPI / PAD: Use time_before() for time comparison
ACPI / PAD: call schedule() when need_resched() is true