tree 08a8a8dab1955bb07724028ece639267502a07ba
parent caa73ea158de9419f08e456f2716c71d1f06012a
parent f244d8b623dae7a7bc695b0336f67729b95a9736
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388493668 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1388493668 +0100

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

Conflicts:
	include/acpi/acpi_bus.h