diff options
| author | Bjorn Helgaas | 2014-10-06 17:59:15 +0200 |
|---|---|---|
| committer | Bjorn Helgaas | 2014-10-06 17:59:15 +0200 |
| commit | f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1 (patch) | |
| tree | c747c9ce1882b9a08d284603717890c5ef81bbf7 /include/uapi/linux/nl80211.h | |
| parent | Merge branch 'pci/virtualization' into next (diff) | |
| parent | arm64: dts: Add APM X-Gene PCIe device tree nodes (diff) | |
| download | kernel-qcow2-linux-f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1.tar.gz kernel-qcow2-linux-f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1.tar.xz kernel-qcow2-linux-f92d9ee3ab39841d1f29f2d1aa96ff7c74b36ee1.zip | |
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 'include/uapi/linux/nl80211.h')
0 files changed, 0 insertions, 0 deletions