From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 30 May 2014 17:41:17 +0000 (-0600)
Subject: Merge branches 'pci/host-exynos', 'pci/host-imx6', 'pci/resource' and 'pci/misc'... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~38^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=617b4157a5c82ab3e9509aa388bfd3d47e0e623a;p=pandora-kernel.git

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
---

617b4157a5c82ab3e9509aa388bfd3d47e0e623a
Reading git-diff-tree failed