diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-11 22:38:25 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-11 22:38:25 +0200 |
commit | 38a6148248e199a4a960bbaa6b8eb14f138b73e1 (patch) | |
tree | c4bbb14bdddc74b34b8a2a787f0f311b5f08d9a8 /Kbuild | |
parent | Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-mvebu' and '... (diff) | |
parent | PCI/MSI: Fix memory leak in free_msi_irqs() (diff) | |
parent | PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L (diff) | |
parent | PCI: Merge multi-line quoted strings (diff) | |
download | linux-38a6148248e199a4a960bbaa6b8eb14f138b73e1.tar.xz linux-38a6148248e199a4a960bbaa6b8eb14f138b73e1.zip |
Merge branches 'pci/msi', 'pci/iommu' and 'pci/cleanup' into next
* pci/msi:
PCI/MSI: Fix memory leak in free_msi_irqs()
* pci/iommu:
PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
PCI: Add bridge DMA alias quirk for ITE bridge
* pci/cleanup:
PCI: Merge multi-line quoted strings
PCI: Whitespace cleanup
PCI: Move EXPORT_SYMBOL so it immediately follows function/variable