From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 12 Feb 2014 13:56:58 +0000 (+0100)
Subject: Merge branches 'acpi-dock', 'acpi-scan' and 'acpi-pci-hotplug'
X-Git-Tag: v3.14-rc3~19^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d990ce0d5be15664546c12ef0bc63fab33f31aa3;p=users%2Fjedix%2Flinux-maple.git

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
---

d990ce0d5be15664546c12ef0bc63fab33f31aa3