projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fe4b04f 8dbdea8)
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Feb 2011 07:44:11 +0000 (08:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Feb 2011 07:44:26 +0000 (08:44 +0100)
Merge reason: Pick up perf fixes that are now upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/perf_event.c patch | diff1 | diff2 | blob | history
tools/perf/util/evsel.c patch | diff1 | diff2 | blob | history

diff --cc kernel/perf_event.c
Simple merge
diff --cc tools/perf/util/evsel.c
Simple merge
John Crispins staging tree