diff options
| author |   Vinod Koul <vkoul@kernel.org> | 2022-01-05 12:48:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-01-05 12:48:05 +0530 |
| commit | 5cb664fbeba0a11592c1d2774833a4cc49d1ca19 (patch) | |
| tree | f5eb47d25d0b90cebbe46d0cbe33bf39bc339eef /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | dmaengine: uniphier-xdmac: Fix type of address variables (diff) | |
| parent | dmaengine: st_fdma: fix MODULE_ALIAS (diff) | |
| download | wireguard-linux-5cb664fbeba0a11592c1d2774833a4cc49d1ca19.tar.xz wireguard-linux-5cb664fbeba0a11592c1d2774833a4cc49d1ca19.zip | |
Merge branch 'fixes' into next
We have a conflict in idxd driver between 'fixes' and 'next' and there
are patches dependent on this so, merge the 'fixes' branch into next
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions