Merge tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Here are two fixes for v4.6:
- You merged a fix for a TI DRA7xx reset issue from another source,
so Sekhar removed the "broken" tag from the driver, and
- I botched a Kconfig merge and broke hotplug configuration for
everybody, so Tero fixed that.
Summary:
TI DRA7xx host bridge driver:
Revert "PCI: dra7xx: Mark driver as broken" (Sekhar Nori)
Miscellaneous:
Restore inclusion of pci/hotplug Kconfig (Tero Roponen)"
* tag 'pci-v4.6-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
Revert "PCI: dra7xx: Mark driver as broken"
PCI: Restore inclusion of pci/hotplug Kconfig
