]> git.karo-electronics.de Git - linux-beck.git/commitdiff
projects / linux-beck.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: afb7119 f1a5278)
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@kernel.org>
Wed, 19 Jun 2013 10:44:41 +0000 (12:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 19 Jun 2013 10:44:41 +0000 (12:44 +0200)
Merge in the latest fixes, to avoid conflicts with ongoing work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
include/linux/perf_event.h patch | diff1 | diff2 | blob | history
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/perf_event.h
Simple merge
diff --cc kernel/events/core.c
Simple merge
Beck SC1x5 Kernel