]> Pileus Git - ~andy/linux/commitdiff
Merge branches 'acpi-dock', 'acpi-scan' and 'acpi-pci-hotplug'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 12 Feb 2014 13:56:58 +0000 (14:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 12 Feb 2014 13:56:58 +0000 (14:56 +0100)
* 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


Trivial merge