From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 21 Feb 2017 21:14:53 +0000 (-0600)
Subject: Merge branch 'pci/host-imx6' into next
X-Git-Tag: v4.11-rc1~92^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34e38bf891bd7bf7c9305ff1d2e1b29a77dd159;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/host-imx6' into next

* pci/host-imx6:
  PCI: imx6: Fix a typo in error message
  PCI: imx6: Remove LTSSM disable workaround
  PCI: imx6: Remove redundant "Link never came up" message

Conflicts:
	drivers/pci/dwc/pci-imx6.c
---

e34e38bf891bd7bf7c9305ff1d2e1b29a77dd159