git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7783549
35d266a
)
Merge branch 'core/percpu' into perfcounters/core
author
Ingo Molnar
<mingo@elte.hu>
Fri, 23 Jan 2009 09:20:15 +0000
(10:20 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 23 Jan 2009 09:20:15 +0000
(10:20 +0100)
Conflicts:
arch/x86/include/asm/hardirq_32.h
arch/x86/include/asm/hardirq_64.h
Semantic merge:
arch/x86/include/asm/hardirq.h
[ added apic_perf_irqs field. ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff