projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aef29bf
aa4a221
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Sat, 4 Jun 2011 10:28:05 +0000
(12:28 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 4 Jun 2011 10:28:05 +0000
(12:28 +0200)
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
1
2
kernel/events/core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
kernel/events/core.c
Simple merge