diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-14 14:09:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-14 14:09:57 +0200 |
| commit | 3f62d5269bc59ce3797397cc54edab17fbe60682 (patch) | |
| tree | ef5fc24774c940a52160c8eef1d1f86d6e08ed11 /kernel/pid.c | |
| parent | 72d39926f098b0c4ad95e1461595a8d6d403c14d (diff) | |
| parent | b60e4ea4a400bde8a4811f94b84a9bb65f81b677 (diff) | |
| parent | daeb20167ddb934d4d604b361406dda858dfa0aa (diff) | |
| download | linux-3f62d5269bc59ce3797397cc54edab17fbe60682.tar.bz2 | |
Merge branches 'device-properties' and 'acpi-misc'
* device-properties:
ACPI / property: Allow holes in reference properties
* acpi-misc:
MAINTAINERS: Add ARM64-specific ACPI maintainers entry