git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8141d00
f5284e7
)
Merge branch 'linus' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 8 Apr 2010 11:36:36 +0000
(13:36 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 8 Apr 2010 11:37:18 +0000
(13:37 +0200)
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff