tree c7e0a3ecdb8ca6dc2e13283479884c6673286eb7
parent 1a55761392b8a4703039614f3ef6275f88dad4c3
parent e7cd7ef58e1fedb09b16720919869a81d7a2b867
author Bjorn Helgaas <bhelgaas@google.com> 1487711610 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1487711610 -0600

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