Merge branch 'linus' into x86/xen
authorIngo Molnar <mingo@elte.hu>
Mon, 25 Aug 2008 08:54:07 +0000 (10:54 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 25 Aug 2008 08:54:07 +0000 (10:54 +0200)
commite4f807c2b4d81636fc63993368646c5bfd42b22f
tree2ff100911b1ba4e26e3d9aad41edb9b48405f01e
parent25258ef762bc4a05fa9c4523f7dae56e3fd01864
parent83097aca8567a0bd593534853b71fe0fa9a75d69
Merge branch 'linus' into x86/xen

Conflicts:
arch/x86/kernel/paravirt.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-x86/xen/hypervisor.h