| commit | 2c5bfce855ead529e2ea6f33757aa26a651d4460 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sat Oct 12 15:19:52 2013 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sat Oct 12 15:19:52 2013 +0200 |
| tree | 2e98e703705510801c055730a45df691b494d138 | |
| parent | aaf3d29fe8c888f3fc1b5e00d66085fe4e06e4cb [diff] | |
| parent | fd3cfebec3199bb89acead236b1ab12c349ed4e0 [diff] |
Merge branch 'acpi-pci-hotplug' * acpi-pci-hotplug: ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots() ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()