diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:37:22 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:37:22 +0200 |
| commit | 9eddc06a3bc79402f50176703237ed045ae77b16 (patch) | |
| tree | 1db5ab96288e121ce8c449d7d60926f270f04407 /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | ed365a4a84a016077d4c07796c75971e45edbbb8 (diff) | |
| parent | 24cf6eef79a7e85cfd2ef9dea52f769c9192fc6e (diff) | |
Merge branch 'mmp/fixes' into arm/dt
These were queued for v5.7 as bugfixes, merge them
here as well to resolve the conflicts.
* mmp/fixes:
ARM: dts: mmp3: Drop usb-nop-xceiv from HSIC phy
ARM: dts: mmp3-dell-ariel: Fix the SPI devices
ARM: dts: mmp3: Use the MMP3 compatible string for /clocks
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions