diff options
author | 2017-02-21 15:15:21 -0600 | |
---|---|---|
committer | 2017-02-21 15:15:21 -0600 | |
commit | e2dc4f225b765c2a12e5eaa7bc09994e67d13741 (patch) | |
tree | d016eb3a48b6c93d579b5dd269c6f065932ba7e2 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'pci/host-iproc' into next (diff) | |
parent | PCI: layerscape: Use of_device_get_match_data() to simplify probe (diff) | |
download | linux-rng-e2dc4f225b765c2a12e5eaa7bc09994e67d13741.tar.xz linux-rng-e2dc4f225b765c2a12e5eaa7bc09994e67d13741.zip |
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
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions