diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-01-27 16:34:04 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-01-27 16:34:04 -0500 |
| commit | e315110657e7335557a2500190b38ef33325a75c (patch) | |
| tree | 518d51a4d0176c4f8db08896806e96d1fd8a1940 /drivers/parisc/ccio-rm-dma.c | |
| parent | 75f30c3d9949aab82d5d63bc9b32665cb2e5df7c (diff) | |
| parent | 4808c35e22a81beec8f36b1a22793e5b153d7a11 (diff) | |
| parent | 04dae5509c0573fbdab52766a14da5dd60c29a6f (diff) | |
| parent | 29ef709195977d151199464b0c4ce4d8f193f244 (diff) | |
| parent | abc596b9a2f3d24b8b0d637bdb071aae7f09801d (diff) | |
Merge branches 'pci/host-keystone', 'pci/host-tegra', 'pci/host-xgene' and 'pci/host-xilinx' into next
* 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