mirror of
https://github.com/LineageOS/android_kernel_fxtec_sm6115.git
synced 2026-06-25 19:12:14 +00:00
Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar <mingo@elte.hu>