| commit | e2dc4f225b765c2a12e5eaa7bc09994e67d13741 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue Feb 21 15:15:21 2017 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue Feb 21 15:15:21 2017 -0600 |
| tree | d016eb3a48b6c93d579b5dd269c6f065932ba7e2 | |
| parent | 68094b4b8d72360f9a90804c203e4292c6662fdd [diff] | |
| parent | 6dc2c04fd9868a5ad00b402935021d6f3ff27b17 [diff] |
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