| commit | d1badf8d4323cfc9325b06651bdfcf7df09f1f0e | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Dec 31 13:41:08 2013 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Dec 31 13:41:08 2013 +0100 |
| tree | 08a8a8dab1955bb07724028ece639267502a07ba | |
| parent | caa73ea158de9419f08e456f2716c71d1f06012a [diff] | |
| parent | f244d8b623dae7a7bc695b0336f67729b95a9736 [diff] |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug Conflicts: include/acpi/acpi_bus.h