git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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


Trivial merge
Pandora Kernel Repository