diff options
| author | Bjorn Helgaas <[email protected]> | 2018-01-31 16:21:33 +0000 |
|---|---|---|
| committer | Bjorn Helgaas <[email protected]> | 2018-01-31 16:21:33 +0000 |
| commit | c7f75aecb2d9436c4bef8b413231f60deae3453c (patch) | |
| tree | ad6082d4a0d79226637af66ee8f2fc4b24590d4b /fs/jbd2/commit.c | |
| parent | Merge branch 'pci/virtualization' into next (diff) | |
| parent | PCI: cadence: Add EndPoint Controller driver for Cadence PCIe controller (diff) | |
| download | kernel-c7f75aecb2d9436c4bef8b413231f60deae3453c.tar.gz kernel-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/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions