]> Pileus Git - ~andy/linux/commitdiff
Merge branch 'pci/host-mvebu' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 8 Jan 2014 00:34:14 +0000 (17:34 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 8 Jan 2014 00:34:14 +0000 (17:34 -0700)
* 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

1  2 
drivers/pci/host/pci-mvebu.c

Simple merge