]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge branch 'pci/host-layerscape' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:15:21 +0000 (15:15 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 21 Feb 2017 21:15:21 +0000 (15:15 -0600)
commite2dc4f225b765c2a12e5eaa7bc09994e67d13741
treed016eb3a48b6c93d579b5dd269c6f065932ba7e2
parent68094b4b8d72360f9a90804c203e4292c6662fdd
parent6dc2c04fd9868a5ad00b402935021d6f3ff27b17
Merge branch 'pci/host-layerscape' into next

* pci/host-layerscape:
  PCI: layerscape: Use of_device_get_match_data() to simplify probe

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