| commit | 1ecf38c8ae5fab7397f7af65a5064a040940a0a1 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Jan 07 17:34:14 2014 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Jan 07 17:34:14 2014 -0700 |
| tree | 2eac64e90a091151ba620baddea5aa704c8c6a9b | |
| parent | 133a36051bc5db5c0a20df41079c246166eab23c [diff] | |
| parent | 06489002a175680e18b4c0dd0beb6aff2a6d3781 [diff] |
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