summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-04-02 00:09:50 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-04-02 00:09:50 +0400
commitf01a586560ac492373add2550c0f93a002be3e65 (patch)
treef59a13edc7d8f135a6451df7fe3411aea3dae548 /drivers
parent08476907abf25315acb4c9a72a0e78bf61456696 (diff)
parent3e9eac50cdcac71a74ca4a8cb587799f474ca62d (diff)
parente1563769f7b4494c5f789c689495c1e90a0d4bfc (diff)
downloadlinux-f01a586560ac492373add2550c0f93a002be3e65.tar.xz
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