]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dcda98 21b7245)
Merge branch 'pci/host-imx6' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:14:53 +0000 (15:14 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:14:53 +0000 (15:14 -0600)
* 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

1  2 
drivers/pci/dwc/pci-imx6.c patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/dwc/pci-imx6.c
Simple merge
local clone of linux.git