diff options
| author | Bjorn Andersson <[email protected]> | 2021-08-16 23:02:26 +0000 |
|---|---|---|
| committer | Bjorn Andersson <[email protected]> | 2021-08-16 23:02:26 +0000 |
| commit | 198b8c8ede36d2135df73fee19506276059a0f8e (patch) | |
| tree | bf6c582edf18fa1a14833e30eded74c722cd1179 /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | arm64: dts: qcom: sm8250: assign DSI clock source parents (diff) | |
| parent | Linux 5.14-rc3 (diff) | |
| download | kernel-198b8c8ede36d2135df73fee19506276059a0f8e.tar.gz kernel-198b8c8ede36d2135df73fee19506276059a0f8e.zip | |
Merge tag 'v5.14-rc3' into arm64-for-5.15
The USB maintainer felt the strong need to push '1f958f3dff42
("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"")'
through the usb tree, so merge v5.14-rc3 to resolve the resulting merge
conflicts.
Signed-off-by: Bjorn Andersson <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions