Merge branches 'acpi-processor' and 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 1 Apr 2014 20:09:50 +0000 (22:09 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 1 Apr 2014 20:09:50 +0000 (22:09 +0200)
commitf01a586560ac492373add2550c0f93a002be3e65
treef59a13edc7d8f135a6451df7fe3411aea3dae548
parent08476907abf25315acb4c9a72a0e78bf61456696
parent3e9eac50cdcac71a74ca4a8cb587799f474ca62d
parente1563769f7b4494c5f789c689495c1e90a0d4bfc
Merge branches 'acpi-processor' and 'pnp'

* acpi-processor:
  Revert "ACPI / processor: Make it possible to get APIC ID via GIC"

* pnp:
  PNP: remove deprecated IRQF_DISABLED
drivers/acpi/processor_core.c