summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki2014-04-01 22:09:50 +0200
committerRafael J. Wysocki2014-04-01 22:09:50 +0200
commitf01a586560ac492373add2550c0f93a002be3e65 (patch)
treef59a13edc7d8f135a6451df7fe3411aea3dae548 /drivers/acpi
parentMerge branch 'acpica' (diff)
parentRevert "ACPI / processor: Make it possible to get APIC ID via GIC" (diff)
parentPNP: remove deprecated IRQF_DISABLED (diff)
downloadkernel-qcow2-linux-f01a586560ac492373add2550c0f93a002be3e65.tar.gz
kernel-qcow2-linux-f01a586560ac492373add2550c0f93a002be3e65.tar.xz
kernel-qcow2-linux-f01a586560ac492373add2550c0f93a002be3e65.zip
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