Merge commit 'v2.6.26-rc8' into x86/xen

author Ingo Molnar <mingo@elte.hu>

Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)

committer Ingo Molnar <mingo@elte.hu>

Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
author Ingo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
committer Ingo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
diff --cc arch/x86/xen/Kconfig
Simple merge
diff --cc arch/x86/xen/time.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Jun 2008 10:16:51 +0000 (12:16 +0200)
		1	2
arch/x86/xen/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/time.c	patch \|	diff1 \|	diff2 \|	blob \| history