summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-12 14:56:58 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-12 14:56:58 +0100
commitd990ce0d5be15664546c12ef0bc63fab33f31aa3 (patch)
tree10b6ed6ec1a68ce4fff018318eddd587d2637f2d /drivers/acpi
parent0a8e5c3d5f0f4929761e6a5bef5358f0ccd8810c (diff)
parent0f6aa09e40c38d734f5d70762056116ca4a76126 (diff)
parent7282059489868e0ed1b0d79765730c6b233a8399 (diff)
downloadop-kernel-dev-d990ce0d5be15664546c12ef0bc63fab33f31aa3.zip
op-kernel-dev-d990ce0d5be15664546c12ef0bc63fab33f31aa3.tar.gz
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
OpenPOWER on IntegriCloud