git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b4fa85
8700600
)
Merge branch 'x86/nmi' into x86/devel
author
Ingo Molnar
<mingo@elte.hu>
Tue, 8 Jul 2008 10:17:08 +0000
(12:17 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 8 Jul 2008 10:17:08 +0000
(12:17 +0200)
Conflicts:
arch/x86/kernel/nmi.c
arch/x86/kernel/nmi_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff