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 | |
| parent | 08476907abf25315acb4c9a72a0e78bf61456696 (diff) | |
| parent | 3e9eac50cdcac71a74ca4a8cb587799f474ca62d (diff) | |
| parent | e1563769f7b4494c5f789c689495c1e90a0d4bfc (diff) | |
| download | linux-f01a586560ac492373add2550c0f93a002be3e65.tar.bz2 | |
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