From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 12:09:00 +0000 (+0100)
Subject: Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy... 
X-Git-Tag: v2.6.30-rc1~211^2~26^2~2^4~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b233969eaa98c7b339d955fe25a58bf6bf25739a;p=pandora-kernel.git

Merge branch 'x86/untangle2' of git://git./linux/kernel/git/jeremy/xen into x86/headers

Conflicts:
	arch/x86/include/asm/page.h
	arch/x86/include/asm/pgtable.h
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c
---

b233969eaa98c7b339d955fe25a58bf6bf25739a
Reading git-diff-tree failed