diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-06 19:59:15 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-06 19:59:15 +0400 |
| commit | f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 (patch) | |
| tree | c747c9ce1882b9a08d284603717890c5ef81bbf7 /drivers/misc/vmw_vmci | |
| parent | 55dd4175a4bc10d943c159dabef552baaf459a59 (diff) | |
| parent | 767ebaff4ef7235eb49ddec5d48db97b17c37cf5 (diff) | |
| download | linux-f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1.tar.xz | |
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 'drivers/misc/vmw_vmci')
0 files changed, 0 insertions, 0 deletions