From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 8 Jan 2014 00:34:14 +0000 (-0700)
Subject: Merge branch 'pci/host-mvebu' into next
X-Git-Tag: firefly_0821_release~176^2~4608^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ecf38c8ae5fab7397f7af65a5064a040940a0a1;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/host-mvebu' into next

* pci/host-mvebu:
  PCI: mvebu: Use max_t() instead of max(resource_size_t,)
  PCI: mvebu: Call pci_ioremap_io() at startup instead of dynamically
---

1ecf38c8ae5fab7397f7af65a5064a040940a0a1