summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-09-25 13:51:55 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-09-25 13:51:55 -0600
commitb1bf29577870d7b10167d1d8ac86e08757993016 (patch)
treecd6b9ce2405db4f6ae60c0df22e5c42b62089f1c /drivers/pci
parent783a28ec0bf2c2d560d8004c92919d112a777e55 (diff)
parent56fab6e189441d714a2bfc8a64f3df9c0749dff7 (diff)
parent65aaae245a2842e3ed9d12f27aeb42fa215dfc2c (diff)
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