From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 1 Oct 2014 18:31:23 +0000 (-0600)
Subject: Merge branch 'pci/host-generic' into next
X-Git-Tag: omap-for-v3.19/prcm-cleanup~136^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07a7cbd3b815ea77b44d4d5bb4260b37d03a358d;p=pandora-kernel.git

Merge branch 'pci/host-generic' into next

* pci/host-generic:
  arm64: Add architectural support for PCI
  PCI: Add pci_remap_iospace() to map bus I/O resources
  of/pci: Add support for parsing PCI host bridge resources from DT
  of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()
  PCI: Add generic domain handling
  of/pci: Fix the conversion of IO ranges into IO resources
  of/pci: Move of_pci_range_to_resource() to of/address.c
  ARM: Define PCI_IOBASE as the base of virtual PCI IO space
  of/pci: Add pci_register_io_range() and pci_pio_to_address()
  asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP

Conflicts:
	drivers/pci/host/pci-tegra.c
---

07a7cbd3b815ea77b44d4d5bb4260b37d03a358d
Reading git-diff-tree failed