]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4db367f 8da8373 4ff248f)
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)
* 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

1  2  3 
arch/ia64/include/asm/acpi.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc arch/ia64/include/asm/acpi.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.