]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
projects / mirror_ubuntu-artful-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 783a28e 56fab6e 65aaae2)
Merge branches 'pci/host-mvebu' and 'pci/host-spear' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 25 Sep 2014 19:51:55 +0000 (13:51 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 25 Sep 2014 19:51:55 +0000 (13:51 -0600)
* pci/host-mvebu:
  PCI: mvebu: Fix uninitialized variable in mvebu_get_tgt_attr()

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


Trivial merge
Ubuntu Artful kernel mirror