git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b55793f
b635ace
)
Merge branch 'linus' into x86/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 14 Aug 2008 12:58:01 +0000
(14:58 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 14 Aug 2008 12:58:01 +0000
(14:58 +0200)
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge