projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70e0d11 db06d75)
Merge branch 'linus' into perf/core, to pick up fixes before merging new changes
authorIngo Molnar <mingo@kernel.org>
Tue, 14 Jun 2016 09:14:34 +0000 (11:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 14 Jun 2016 09:14:34 +0000 (11:14 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/events/intel/uncore_snbep.c patch | diff1 | diff2 | blob | history
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/events/intel/uncore_snbep.c
Simple merge
diff --cc kernel/events/core.c
Simple merge