Merge branches 'acpi-processor' and 'acpi-pad'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:09:41 +0000 (23:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 3 Jun 2014 21:09:41 +0000 (23:09 +0200)
commit26f8784e2d7b9294399ce8f8b276beeb40201345
tree7bd6c621fdebc91be059bcfab1690bca02b02615
parent4db367fd095d278dd92158e4b6ae7a737926d30b
parent8da8373447d6a57a5a9f55233d35beb15d92d0d2
parent4ff248f3bf830ba22c988abb099e1836fbd3b1d0
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
arch/ia64/include/asm/acpi.h