From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 6 Oct 2014 15:59:15 +0000 (-0600)
Subject: Merge branch 'pci/host-xgene' into next
X-Git-Tag: omap-for-v3.19/prcm-cleanup~136^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1;p=pandora-kernel.git

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
---

f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1
Reading git-diff-tree failed