diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 13:41:08 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-31 13:41:08 +0100 |
| commit | d1badf8d4323cfc9325b06651bdfcf7df09f1f0e (patch) | |
| tree | 08a8a8dab1955bb07724028ece639267502a07ba /drivers/pci/pci-acpi.c | |
| parent | caa73ea158de9419f08e456f2716c71d1f06012a (diff) | |
| parent | f244d8b623dae7a7bc695b0336f67729b95a9736 (diff) | |
| download | linux-d1badf8d4323cfc9325b06651bdfcf7df09f1f0e.tar.bz2 | |
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
Conflicts:
include/acpi/acpi_bus.h
Diffstat (limited to 'drivers/pci/pci-acpi.c')
0 files changed, 0 insertions, 0 deletions