From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 25 Jun 2008 10:16:51 +0000 (+0200)
Subject: Merge commit 'v2.6.26-rc8' into x86/xen
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d02859ecb321c8c0f74cb9bbe3f51a59e58822b0;p=linux.git

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

Conflicts:

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

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

d02859ecb321c8c0f74cb9bbe3f51a59e58822b0