git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e4e91ac
ee6dcfa
)
Merge branch 'perf/urgent' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Fri, 26 Nov 2010 14:07:02 +0000
(15:07 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 26 Nov 2010 14:07:02 +0000
(15:07 +0100)
Conflicts:
arch/x86/kernel/apic/hw_nmi.c
Merge reason: Resolve conflict, queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff