From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 1 Apr 2014 20:09:50 +0000 (+0200)
Subject: Merge branches 'acpi-processor' and 'pnp'
X-Git-Tag: v3.15-rc1~122^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f01a586560ac492373add2550c0f93a002be3e65;p=thirdparty%2Fkernel%2Fstable.git

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
---

f01a586560ac492373add2550c0f93a002be3e65