]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'linus' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:35:23 +0000 (12:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 12 Oct 2008 10:37:32 +0000 (12:37 +0200)
commit365d46dc9be9b3c833990a06f3994b1987eda578
tree9397d1304144a288411f2118707f44ff5e862fa6
parent5dc64a3442b98eaa0e3730c35fcf00cf962a93e7
parentfd048088306656824958e7783ffcee27e241b361
Merge branch 'linus' into x86/xen

Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
17 files changed:
arch/x86/kernel/Makefile
arch/x86/kernel/cpu/common.c
arch/x86/kernel/ldt.c
arch/x86/kernel/paravirt.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/smpboot.c
arch/x86/mm/fault.c
arch/x86/xen/enlighten.c
drivers/block/xen-blkfront.c
include/asm-x86/desc.h
include/asm-x86/paravirt.h
include/asm-x86/smp.h
include/asm-x86/spinlock.h
include/asm-x86/tlbflush.h
include/asm-x86/xen/hypervisor.h
include/linux/sched.h