diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 11:41:17 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 11:41:17 -0600 |
| commit | 617b4157a5c82ab3e9509aa388bfd3d47e0e623a (patch) | |
| tree | 391f4ea35512812bb888a73f67e2121db3a6da80 /arch/mips/include/asm/sim.h | |
| parent | d785260e2f57d87de5c059de2dabc3cd31b745f0 (diff) | |
| parent | 17d7acc8e1c81f8125730aa900c67412a2ac69e2 (diff) | |
| parent | d1dc9749a5b8239d9ae718a176b5cd39ff89f976 (diff) | |
| parent | 06b00514b7f931eb94e3f56009ece8ae55488150 (diff) | |
| parent | 8b5742ad156d30ee38486652cdbd152e2d6ebbcc (diff) | |
Merge branches 'pci/host-exynos', 'pci/host-imx6', 'pci/resource' and 'pci/misc' into next
* pci/host-exynos:
PCI: exynos: Fix add_pcie_port() section mismatch warning
* pci/host-imx6:
PCI: imx6: Add support for MSI
PCI: designware: Make MSI ISR shared IRQ aware
PCI: imx6: Remove optional (and unused) IRQs
PCI: imx6: Drop old IRQ mapping
PCI: imx6: Use new clock names
PCI: imx6: Fix imx6_add_pcie_port() section mismatch warning
* pci/resource:
i82875p_edac: Assign PCI resources before adding device
* pci/misc:
ARM/PCI: Call pcie_bus_configure_settings() to set MPS
PCI: Make pci_bus_add_device() void
Conflicts:
drivers/edac/i82875p_edac.c