Skip to content
Commit a9a6bb46 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/acpi' into next 

* pci/acpi:
  ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle
parents 9e66317d a0040c01
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment