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)
* acpi-processor:
  Revert "ACPI / processor: Make it possible to get APIC ID via GIC"

* pnp:
  PNP: remove deprecated IRQF_DISABLED

1  2  3 
drivers/acpi/processor_core.c

Simple merge