From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 8 Jul 2008 10:24:29 +0000 (+0200)
Subject: Merge branch 'x86/fixmap' into x86/devel
X-Git-Tag: Ubuntu-5.0.0-8.9~32999^2~243
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6236af82d8a989e150a02800c210eb61cb1e17be;p=mirror_ubuntu-disco-kernel.git

Merge branch 'x86/fixmap' into x86/devel

Conflicts:

	arch/x86/mm/init_64.c

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

6236af82d8a989e150a02800c210eb61cb1e17be