Merge branch 'pci/host-imx6' into next

Browse source

* 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

...

This commit is contained in:

Bjorn Helgaas 2017-02-21 15:14:53 -06:00

parent 5dcda98a3b 21b7245034

commit e34e38bf89

1 changed files with 2 additions and 35 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

37

drivers/pci/dwc/pci-imx6.c

View file