OSDN Git Service

(root) / uclinux-h8 / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b0c53e 5542b2a)
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
authorIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 07:59:28 +0000 (09:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 31 Jul 2015 07:59:28 +0000 (09:59 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c patch | diff1 | diff2 | blob | history
tools/perf/config/Makefile patch | diff1 | diff2 | blob | history

diff --cc kernel/events/core.c
Simple merge
diff --cc tools/perf/config/Makefile
Simple merge
About OSDN
Find Software
Develop Software
Help