projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55dd417 767ebaf)
Merge branch 'pci/host-xgene' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 6 Oct 2014 15:59:15 +0000 (09:59 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 6 Oct 2014 15:59:15 +0000 (09:59 -0600)
commitf92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1
treec747c9ce1882b9a08d284603717890c5ef81bbf7tree | snapshot
parent55dd4175a4bc10d943c159dabef552baaf459a59commit | diff
parent767ebaff4ef7235eb49ddec5d48db97b17c37cf5commit | diff
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
MAINTAINERS diff1 | diff2 | blob | history
drivers/pci/host/Kconfig diff1 | diff2 | blob | history
drivers/pci/host/Makefile diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.