diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-29 21:44:53 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-29 21:44:53 +0100 |
| commit | 0bce39ccb2efab511dd1a08e3a3b4b5e1590ec9f (patch) | |
| tree | 2961e1db85d7e187cff22c3a71ccf94db6e78960 /drivers/pci | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| parent | b186b4dcb79b1914c3dadb27ac72dafaa4267998 (diff) | |
| parent | 2c3033a0664dfae91e1dee7fabac10f24354b958 (diff) | |
| download | linux-0bce39ccb2efab511dd1a08e3a3b4b5e1590ec9f.tar.bz2 | |
Merge branches 'acpi-video' and 'acpi-hotplug'
* acpi-video:
ACPI: Revert "ACPI / video: Add Dell Inspiron 5737 to the blacklist"
* acpi-hotplug:
ACPI / PCI / hotplug: unlock in error path in acpiphp_enable_slot()