]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
commite34e38bf891bd7bf7c9305ff1d2e1b29a77dd159
treeac5c02d6feccd81a28df27e5b4f82eeaeed41d06
parent5dcda98a3b7cfc0025ca49a700765ac9ba78a6a7
parent21b7245034aa83c80fb8d0011e18d597a62a91f1
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
drivers/pci/dwc/pci-imx6.c