git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a146649
0cd5c3c
)
Merge branch 'x86/urgent' into x86/apic
author
Ingo Molnar
<mingo@elte.hu>
Sat, 31 Jan 2009 16:32:31 +0000
(17:32 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Feb 2009 21:30:01 +0000
(22:30 +0100)
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff