diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:50 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-04-01 22:09:50 +0200 |
| commit | f01a586560ac492373add2550c0f93a002be3e65 (patch) | |
| tree | f59a13edc7d8f135a6451df7fe3411aea3dae548 /drivers/acpi | |
| parent | Merge branch 'acpica' (diff) | |
| parent | Revert "ACPI / processor: Make it possible to get APIC ID via GIC" (diff) | |
| parent | PNP: remove deprecated IRQF_DISABLED (diff) | |
| download | linux-f01a586560ac492373add2550c0f93a002be3e65.tar.xz 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