diff options
| author | Rafael J. Wysocki | 2015-01-06 23:35:43 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2015-01-06 23:35:43 +0100 |
| commit | 794c3a0a9380d46cebff14b0d9b409ecb7687480 (patch) | |
| tree | 20a3c363938f717dceb373c2df76b22b90054ae6 /include/linux/reset-controller.h | |
| parent | 1b1f3e1699a9886f1070f94171097ab4ccdbfc95 (diff) | |
| parent | d02dc27db0dc74683efc4a2b36f55f5594451f38 (diff) | |
| parent | 6a3ef10bacb08860805e9053f919786dc34760ba (diff) | |
Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video'
* acpi-pm:
ACPI / PM: Fix PM initialization for devices that are not present
* acpi-processor:
ACPI / processor: Rename acpi_(un)map_lsapic() to acpi_(un)map_cpu()
ACPI / processor: Convert apic_id to phys_id to make it arch agnostic
* acpi-video:
ACPI / video: Add disable_native_backlight quirk for Dell XPS15 L521X