summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-04-10 16:26:54 +0300
committerBjorn Helgaas <bhelgaas@google.com>2015-04-10 16:26:54 +0300
commit4dd1f57956ada782fd80b1c11c30a9595d6caafc (patch)
treeca16ce62ba1760a5bdcea7b3fe77ad457a4c9e54 /sound/oss
parent8e795840e4d89df3d594e736989212ee8a4a1fca (diff)
parent01d06a9a4c28b6b0121014591a3c3da5e908d51e (diff)
parent1fb37a8178da007cad75f48e2355b9dcb0711e06 (diff)
parentf76ea574d615cd003b2fc51580006f7dc220897c (diff)
parente3dc17a53f9649d0a67ec69ec883e781fa9dd920 (diff)
parentab14d45ea58eae67c739e4ba01871cae7b6c4586 (diff)
parent7a27db23a3f697b730422482df7d21c93f84fe4a (diff)
parent873581698d391ff070fc1eb8fb298c85e873c07c (diff)
downloadlinux-4dd1f57956ada782fd80b1c11c30a9595d6caafc.tar.xz
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