From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 5 Mar 2009 20:48:31 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/core
X-Git-Tag: v2.6.30-rc1~2^2~50^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1413c89ae6a4b7a9a43f7768934a81ffb5c629a;p=pandora-kernel.git

Merge branch 'x86/urgent' into x86/core

Conflicts:
	arch/x86/include/asm/fixmap_64.h
Semantic merge:
	arch/x86/include/asm/fixmap.h

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

a1413c89ae6a4b7a9a43f7768934a81ffb5c629a
Reading git-diff-tree failed