]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pci/host-keystone', 'pci/host-tegra', 'pci/host-xgene' and 'pci/host...
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 27 Jan 2015 21:34:04 +0000 (15:34 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 27 Jan 2015 21:34:04 +0000 (15:34 -0600)
* pci/host-keystone:
  PCI: keystone: Fix misspelling of current function in debug output

* pci/host-tegra:
  PCI: tegra: Remove unnecessary tegra_pcie_fixup_bridge()

* pci/host-xgene:
  PCI: xgene: Include clk.h instead of clk-private.h

* pci/host-xilinx:
  PCI: xilinx: Fix harmless format string warning


Trivial merge