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

Merge branch 'x86/urgent' into x86/mm

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

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

6d2e91bf80e4410207f01edb0962aec9213f3533
Reading git-diff-tree failed