diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-25 21:51:55 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-25 21:51:55 +0200 |
commit | b1bf29577870d7b10167d1d8ac86e08757993016 (patch) | |
tree | cd6b9ce2405db4f6ae60c0df22e5c42b62089f1c /drivers | |
parent | Merge branches 'pci/hotplug', 'pci/initdata' and 'pci/misc' into next (diff) | |
parent | PCI: mvebu: Fix uninitialized variable in mvebu_get_tgt_attr() (diff) | |
parent | PCI: spear: Pass config resource through reg property (diff) | |
download | linux-b1bf29577870d7b10167d1d8ac86e08757993016.tar.xz linux-b1bf29577870d7b10167d1d8ac86e08757993016.zip |
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