Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by:
Ingo Molnar <mingo@elte.hu>