Merge branch 'pci/host/qcom'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:40 +0000 (16:10 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 6 Jun 2018 21:10:40 +0000 (16:10 -0500)
commit4c31ff0b3a5fe1f0012479f1c8eb3df0464e7742
tree49eeb4ac92f91da615a78c54066b7527376cc7f3
parent93763ee6518606f9a813a6b084ffc6fd5aa72f4f
parenta70aa7684b9ea1ca6ebd3d040a9d94b0e60ee22a
Merge branch 'pci/host/qcom'

* pci/host/qcom:
  PCI: qcom: Include gpio/consumer.h
drivers/pci/dwc/pcie-qcom.c