diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-29 23:23:33 (GMT) |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-29 23:23:33 (GMT) |
commit | e89c33168aad32436da842ddda307dcc31c0c4e2 (patch) | |
tree | 831668bbda77e4b5ff463b26a75c8f88819436aa /fs/ocfs2/dlm/dlmcommon.h | |
parent | 2e8b5f621dbe29425906852c6079afb6b28720cb (diff) | |
parent | 3dc48af310709b85d07c8b0d3aa8f1ead02829d3 (diff) | |
download | linux-fsl-qoriq-e89c33168aad32436da842ddda307dcc31c0c4e2.tar.xz |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/ACPI: Fix _OSC ordering to allow PCIe hotplug use when available
PCI: exynos: Add I/O access wrappers
PCI: designware: Drop "addr" arg from dw_pcie_readl_rc()/dw_pcie_writel_rc()
Diffstat (limited to 'fs/ocfs2/dlm/dlmcommon.h')
0 files changed, 0 insertions, 0 deletions