projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6946646
586c6e7
)
Merge branch 'linus' into x86/asm
author
Ingo Molnar
<mingo@elte.hu>
Tue, 28 Feb 2012 09:26:07 +0000
(10:26 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 28 Feb 2012 09:27:36 +0000
(10:27 +0100)
Sync up the latest NMI fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
1
2
arch/x86/kernel/entry_64.S
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/kernel/entry_64.S
Simple merge