| commit | 4b49b9fe2b5220374ddc1c122cc31e00cc20365f | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Feb 12 12:56:56 2014 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Wed Feb 12 12:56:56 2014 +0100 |
| tree | d8c3c3ff835da7238cc0b1d6817f7bcf5b735ecd | |
| parent | 7282059489868e0ed1b0d79765730c6b233a8399 [diff] | |
| parent | 21369c77477a7f937174833c8094154f0f995710 [diff] |
Merge back earlier 'acpi-pci-hotplug' material. Conflicts: drivers/pci/hotplug/acpiphp_glue.c