mirror of
https://github.com/joel16/android_kernel_sony_msm8994.git
synced 2025-02-16 11:20:00 +00:00
![Ingo Molnar](/assets/img/avatar_default.png)
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>