git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75ec5a2
8bb39f9
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Fri, 2 Apr 2010 17:37:50 +0000
(19:37 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 2 Apr 2010 17:38:10 +0000
(19:38 +0200)
Conflicts:
arch/x86/kernel/cpu/perf_event.c
Merge reason: Resolve the conflict, pick up fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff