projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e46d21 a4b4f11)
Merge branch 'perf/urgent' into perf/core, to avoid conflicts
authorIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:39:22 +0000 (13:39 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 7 May 2014 11:39:22 +0000 (13:39 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c patch | diff1 | diff2 | blob | history
kernel/hrtimer.c patch | diff1 | diff2 | blob | history

diff --cc kernel/events/core.c
Simple merge
diff --cc kernel/hrtimer.c
Simple merge