mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2025-01-15 05:28:25 +00:00
548b841669
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>