diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-12 14:56:58 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-12 14:56:58 +0100 |
| commit | d990ce0d5be15664546c12ef0bc63fab33f31aa3 (patch) | |
| tree | 10b6ed6ec1a68ce4fff018318eddd587d2637f2d /drivers/acpi | |
| parent | ACPI / dock: Use acpi_device_enumerated() to check if dock is present (diff) | |
| parent | ACPI / container: Fix error code path in container_device_attach() (diff) | |
| parent | ACPI / hotplug / PCI: Relax the checking of _STA return values (diff) | |
| download | linux-d990ce0d5be15664546c12ef0bc63fab33f31aa3.tar.xz linux-d990ce0d5be15664546c12ef0bc63fab33f31aa3.zip | |
Merge branches 'acpi-dock', 'acpi-scan' and 'acpi-pci-hotplug'
* acpi-dock:
ACPI / dock: Use acpi_device_enumerated() to check if dock is present
* acpi-scan:
ACPI / container: Fix error code path in container_device_attach()
* acpi-pci-hotplug:
ACPI / hotplug / PCI: Relax the checking of _STA return values