tree c747c9ce1882b9a08d284603717890c5ef81bbf7
parent 55dd4175a4bc10d943c159dabef552baaf459a59
parent 767ebaff4ef7235eb49ddec5d48db97b17c37cf5
author Bjorn Helgaas <bhelgaas@google.com> 1412611155 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1412611155 -0600

Merge branch 'pci/host-xgene' into next

* pci/host-xgene:
  arm64: dts: Add APM X-Gene PCIe device tree nodes
  PCI: xgene: Add APM X-Gene PCIe driver

Conflicts:
	drivers/pci/host/Kconfig
	drivers/pci/host/Makefile