]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'pci/acpi' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:19 +0000 (12:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 14 Nov 2017 18:11:19 +0000 (12:11 -0600)
* pci/acpi:
  ACPI / PCI: Bail early in acpi_pci_add_bus() if there is no ACPI handle


Trivial merge