Merge branch 'pci/hotplug' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 31 Jan 2018 16:10:31 +0000 (10:10 -0600)
committerBjorn Helgaas <helgaas@kernel.org>
Wed, 31 Jan 2018 16:10:31 +0000 (10:10 -0600)
* pci/hotplug:
  PCI: pciehp: Assume NoCompl+ for Thunderbolt ports
  PCI: hotplug: Drop checking of PCI_BRIDGE_CONTROL in *_unconfigure_device()


Trivial merge