diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-26 23:29:17 (GMT) |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-26 23:29:17 (GMT) |
commit | e5558d1a516fa6924fa8d53152b665d4c26f142e (patch) | |
tree | d19b4991587b70ce5cd2f7e749f67618ed421476 /drivers/pci/setup-res.c | |
parent | 518a6a34f645897ec3440e5cbcf53ced3493ee1c (diff) | |
parent | 14574674e461077a9f4dd5eae050f622e8b8c084 (diff) | |
parent | 3cb30b73ad71b384c6289243d4ccd31ab90bce6f (diff) | |
parent | 034cd97ebda4062eb4402a6cf963ccd262caa86a (diff) | |
parent | 9edbcd2252b5ef148177c9f2c11a56469cf5db52 (diff) | |
parent | 67d29b5c6c40e91b124695e9250c2fd24915e24a (diff) | |
download | linux-e5558d1a516fa6924fa8d53152b665d4c26f142e.tar.xz |
Merge branches 'dma-api', 'pci/virtualization', 'pci/msi', 'pci/misc' and 'pci/resource' into next
* dma-api:
iommu/exynos: Remove unnecessary "&" from function pointers
DMA-API: Update dma_pool_create ()and dma_pool_alloc() descriptions
DMA-API: Fix duplicated word in DMA-API-HOWTO.txt
DMA-API: Capitalize "CPU" consistently
sh/PCI: Pass GAPSPCI_DMA_BASE CPU & bus address to dma_declare_coherent_memory()
DMA-API: Change dma_declare_coherent_memory() CPU address to phys_addr_t
DMA-API: Clarify physical/bus address distinction
* pci/virtualization:
PCI: Mark RTL8110SC INTx masking as broken
* pci/msi:
PCI/MSI: Remove pci_enable_msi_block()
* pci/misc:
PCI: Remove pcibios_add_platform_entries()
s390/pci: use pdev->dev.groups for attribute creation
PCI: Move Open Firmware devspec attribute to PCI common code
* pci/resource:
PCI: Add resource allocation comments
PCI: Simplify __pci_assign_resource() coding style
PCI: Change pbus_size_mem() return values to be more conventional
PCI: Restrict 64-bit prefetchable bridge windows to 64-bit resources
PCI: Support BAR sizes up to 8GB
resources: Clarify sanity check message
PCI: Don't add disabled subtractive decode bus resources
PCI: Don't print anything while decoding is disabled
PCI: Don't set BAR to zero if dma_addr_t is too small
PCI: Don't convert BAR address to resource if dma_addr_t is too small
PCI: Reject BAR above 4GB if dma_addr_t is too small
PCI: Fail safely if we can't handle BARs larger than 4GB
x86/gart: Tidy messages and add bridge device info
x86/gart: Replace printk() with pr_info()
x86/PCI: Move pcibios_assign_resources() annotation to definition
x86/PCI: Mark ATI SBx00 HPET BAR as IORESOURCE_PCI_FIXED
x86/PCI: Don't try to move IORESOURCE_PCI_FIXED resources
x86/PCI: Fix Broadcom CNB20LE unintended sign extension