]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Jun 2013 20:46:47 +0000 (22:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 25 Jun 2013 20:46:47 +0000 (22:46 +0200)
* acpi-fixes:
  libata-acpi: add back ACPI based hotplug functionality
  ACPI / dock / PCI: Synchronous handling of dock events for PCI devices
  PCI / ACPI: Use boot-time resource allocation rules during hotplug
  ACPI / dock: Initialize ACPI dock subsystem upfront


Trivial merge