summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-04-10 15:26:54 +0200
committerBjorn Helgaas <bhelgaas@google.com>2015-04-10 15:26:54 +0200
commit4dd1f57956ada782fd80b1c11c30a9595d6caafc (patch)
treeca16ce62ba1760a5bdcea7b3fe77ad457a4c9e54 /drivers/acpi
parentMerge branches 'pci/enumeration' and 'pci/virtualization' into next (diff)
parentPCI: exynos: Fix INTx enablement statement termination error (diff)
parentPCI: iproc: Add Broadcom iProc PCIe support (diff)
parentPCI: keystone: Don't dereference possible NULL pointer (diff)
parentPCI: layerscape: Simplify platform_get_resource_byname() failure checking (diff)
parentPCI: mvebu: Add suspend/resume support (diff)
parentPCI: rcar: Verify that mem_res is 64K-aligned (diff)
parentPCI: versatile: Check for devm_ioremap_resource() failures (diff)
downloadlinux-4dd1f57956ada782fd80b1c11c30a9595d6caafc.tar.xz
linux-4dd1f57956ada782fd80b1c11c30a9595d6caafc.zip
Merge branches 'pci/host-exynos', 'pci/host-iproc', 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-mvebu', 'pci/host-rcar' and 'pci/host-versatile' into next
* pci/host-exynos: PCI: exynos: Fix INTx enablement statement termination error * pci/host-iproc: PCI: iproc: Add Broadcom iProc PCIe support PCI: iproc: Add DT docs for Broadcom iProc PCIe driver PCI: Export symbols required for loadable host driver modules * pci/host-keystone: PCI: keystone: Don't dereference possible NULL pointer * pci/host-layerscape: PCI: layerscape: Simplify platform_get_resource_byname() failure checking * pci/host-mvebu: PCI: mvebu: Add suspend/resume support * pci/host-rcar: PCI: rcar: Verify that mem_res is 64K-aligned PCI: rcar: Change PCIEPARL and PCIEPARH to PCIEPALR and PCIEPAUR PCI: rcar: Write zeroes to reserved PCIEPARL bits PCI: rcar: Fix position of MSI enable bit * pci/host-versatile: PCI: versatile: Check for devm_ioremap_resource() failures