summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-10-06 09:59:15 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-10-06 09:59:15 -0600
commitf92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 (patch)
treec747c9ce1882b9a08d284603717890c5ef81bbf7 /arch/ia64
parent55dd4175a4bc10d943c159dabef552baaf459a59 (diff)
parent767ebaff4ef7235eb49ddec5d48db97b17c37cf5 (diff)
downloadlinux-f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1.tar.bz2
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
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions