mirror of
https://github.com/LineageOS/android_kernel_samsung_msm8226.git
synced 2026-10-02 00:00:41 +02:00
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>