tree 14bf855f9bb377b67887d21892e0cacc259c6204
parent 1e3bcb596c6b1cf6db93f8f506e2de260e771bad
parent b8a62d540240387c7e97a69127cab3ab9cadc70a
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1394063306 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1394063306 +0100

Merge branch 'acpi-pci-hotplug' into acpi-hotplug