summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-07-17 03:09:47 +0400
committerBjorn Helgaas <bhelgaas@google.com>2014-07-17 03:09:47 +0400
commit792688fde431b4fdb2cf10a6f7589a8176b6b14a (patch)
tree84357d91c5c99b8ecf3f910ddac989ac3f73ab5e
parent1d0df48692af1bbaced270e04b3d262810fe0e14 (diff)
parenteed6542dd53faa2f430abbd35e999c1f345d1edb (diff)
parent505d8655f710b61c42ec74e3720dcf545f12a668 (diff)
parent68947eb17503ce2009c603d0d0bb9feb139fb8b8 (diff)
parentd975cb5703c37ca66a10608855ccc13bedc3898a (diff)
parente11ece5a5e4292243076290d22bf2860a541e223 (diff)
parent1f6ae47ecff7f23da73417e068018b311f3b5583 (diff)
parent64da465e9841f93183744a9dadf992f938ac3910 (diff)
parent21dd5a43d00ca513c6a4a31fa86bbe608f68ed49 (diff)
downloadlinux-792688fde431b4fdb2cf10a6f7589a8176b6b14a.tar.xz
Merge branches 'pci/host-generic', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-tegra', 'pci/msi', 'pci/misc', 'pci/resource' and 'pci/virtualization' into next
* pci/host-generic: PCI: generic: Fix GPL v2 license string typo * pci/host-mvebu: PCI: mvebu: Fix GPL v2 license string typo * pci/host-rcar: PCI: rcar: Fix GPL v2 license string typo * pci/host-tegra: PCI: tegra: Fix GPL v2 license string typo * pci/msi: PCI/MSI: Use irq_get_msi_desc() to simplify code PCI/MSI: Remove unused list access in __pci_restore_msix_state() PCI/MSI: Retrieve first MSI IRQ from msi_desc rather than pci_dev PCI/MSI: Remove unused function msi_remove_pci_irq_vectors() PCI/MSI: Add msi_setup_entry() to clean up MSI initialization * pci/misc: PCI: Configure ASPM when enabling device x86: don't exclude low BIOS area when allocating address space for non-PCI cards PCI: Add include guard to include/linux/pci_ids.h x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup() * pci/resource: PCI: Tidy resource assignment messages PCI: Return conventional error values from pci_revert_fw_address() PCI: Cleanup control flow PCI: Support BAR sizes up to 128GB PCI: Keep original resource if we fail to expand it * pci/virtualization: powerpc/pci: Remove duplicate logic PCI: Make resetting secondary bus logic common