From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 25 Aug 2008 08:54:07 +0000 (+0200)
Subject: Merge branch 'linus' into x86/xen
X-Git-Tag: v2.6.28-rc1~699^2^2~21
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e4f807c2b4d81636fc63993368646c5bfd42b22f;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/xen

Conflicts:
	arch/x86/kernel/paravirt.c

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

e4f807c2b4d81636fc63993368646c5bfd42b22f