From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 8 May 2009 08:50:00 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/xen
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f066a155334642b8a206eec625b1925d88c48aeb;p=deliverable%2Flinux.git

Merge branch 'x86/urgent' into x86/xen

Conflicts:
	arch/frv/include/asm/pgtable.h
	arch/x86/include/asm/required-features.h
	arch/x86/xen/mmu.c

Merge reason: x86/xen was on a .29 base still, move it to a fresher
              branch and pick up Xen fixes as well, plus resolve
              conflicts

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

f066a155334642b8a206eec625b1925d88c48aeb