Merge commit 'v2.6.26-rc8' into x86/xen
Ingo Molnar [Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)]
Conflicts:

arch/x86/xen/enlighten.c
arch/x86/xen/mmu.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/xen/Kconfig
arch/x86/xen/time.c

Simple merge
Simple merge