Merge branch 'x86/fixmap' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:24:29 +0000 (12:24 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:24:29 +0000 (12:24 +0200)
Conflicts:

arch/x86/mm/init_64.c

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

Trivial merge