]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc70ff4076c0842b7adba4f3380599ae6714d45a1
tree10b6ed6ec1a68ce4fff018318eddd587d2637f2d
parent2cbe52712e806b50987752fbc4fdcbd668482d42
parent46a2ce13371dc6bb7ce9f797845002ed1e6186e7
parentc4c61222ebf13f00f0660b178f79b702219b5910
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