diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:13:30 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:13:30 +0300 |
commit | b2e6d3055d5545b97533d4e8376fa848639d9951 (patch) | |
tree | c7e0a3ecdb8ca6dc2e13283479884c6673286eb7 /sound/aoa/Makefile | |
parent | 1a55761392b8a4703039614f3ef6275f88dad4c3 (diff) | |
parent | e7cd7ef58e1fedb09b16720919869a81d7a2b867 (diff) | |
download | linux-b2e6d3055d5545b97533d4e8376fa848639d9951.tar.xz |
Merge branch 'pci/host-exynos' into next
* pci/host-exynos:
PCI: exynos: Support the PHY generic framework
Documentation: binding: Modify the exynos5440 PCIe binding
phy: phy-exynos-pcie: Add support for Exynos PCIe PHY
Documentation: samsung-phy: Add exynos-pcie-phy binding
PCI: exynos: Refactor to make it easier to support other SoCs
PCI: exynos: Remove duplicated code
PCI: exynos: Use the bitops BIT() macro to build bitmasks
PCI: exynos: Remove unnecessary local variables
PCI: exynos: Replace the *_blk/*_phy/*_elb accessors
PCI: exynos: Rename all pointer names from "exynos_pcie" to "ep"
Conflicts:
drivers/pci/dwc/pci-exynos.c
Diffstat (limited to 'sound/aoa/Makefile')
0 files changed, 0 insertions, 0 deletions