tree cd6b9ce2405db4f6ae60c0df22e5c42b62089f1c
parent 783a28ec0bf2c2d560d8004c92919d112a777e55
parent 56fab6e189441d714a2bfc8a64f3df9c0749dff7
parent 65aaae245a2842e3ed9d12f27aeb42fa215dfc2c
author Bjorn Helgaas <bhelgaas@google.com> 1411674715 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1411674715 -0600

Merge branches 'pci/host-mvebu' and 'pci/host-spear' into next

* pci/host-mvebu:
  PCI: mvebu: Fix uninitialized variable in mvebu_get_tgt_attr()

* pci/host-spear:
  PCI: spear: Pass config resource through reg property