diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-11-03 17:39:32 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-11-03 17:39:32 +0300 |
| commit | 7225107e158241b7e22f15b9f4c3db0b3330984d (patch) | |
| tree | 7050af734ec625ac7ee53b8487b8ece65a5f0967 /fs/ocfs2/heartbeat.c | |
| parent | 4ed31f24a6416cc60bc8e92c25b2de3060fbedf8 (diff) | |
| parent | bd33b87a9a15f8182e8c6a49f5413e7ef79372bf (diff) | |
| download | linux-7225107e158241b7e22f15b9f4c3db0b3330984d.tar.xz | |
Merge branch 'pci/host-layerscape' into next
* pci/host-layerscape:
PCI: layerscape: Add ls_pcie_msi_host_init()
PCI: layerscape: Add support for LS1043a and LS2080a
PCI: layerscape: Remove unused fields from struct ls_pcie
PCI: layerscape: Update ls_add_pcie_port()
PCI: layerscape: Factor out SCFG related function
PCI: layerscape: Ignore PCIe controllers in Endpoint mode
PCI: layerscape: Remove ls_pcie_establish_link()
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
0 files changed, 0 insertions, 0 deletions