summaryrefslogtreecommitdiffstats
path: root/fs/nilfs2
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-01-31 17:21:33 +0100
committerBjorn Helgaas <helgaas@kernel.org>2018-01-31 17:21:33 +0100
commitc7f75aecb2d9436c4bef8b413231f60deae3453c (patch)
treead6082d4a0d79226637af66ee8f2fc4b24590d4b /fs/nilfs2
parentMerge branch 'pci/virtualization' into next (diff)
parentPCI: cadence: Add EndPoint Controller driver for Cadence PCIe controller (diff)
downloadlinux-c7f75aecb2d9436c4bef8b413231f60deae3453c.tar.xz
linux-c7f75aecb2d9436c4bef8b413231f60deae3453c.zip
Merge remote-tracking branch 'lorenzo/pci/cadence' into next
* lorenzo/pci/cadence: PCI: cadence: Add EndPoint Controller driver for Cadence PCIe controller dt-bindings: PCI: cadence: Add DT bindings for Cadence PCIe endpoint controller PCI: endpoint: Fix EPF device name to support multi-function devices PCI: endpoint: Add the function number as argument to EPC ops PCI: cadence: Add host driver for Cadence PCIe controller dt-bindings: PCI: cadence: Add DT bindings for Cadence PCIe host controller PCI: Add vendor ID for Cadence PCI: Add generic function to probe PCI host controllers PCI: generic: fix missing call of pci_free_resource_list() PCI: OF: Add generic function to parse and allocate PCI resources PCI: Regroup all PCI related entries into drivers/pci/Makefile Conflicts: drivers/pci/of.c include/linux/pci.h
Diffstat (limited to 'fs/nilfs2')
0 files changed, 0 insertions, 0 deletions