Stefan Lankes b5908af744 Merge branch 'master' of git.lfbs.rwth-aachen.de:metalsvm into doxygen ... Conflicts: .gitignore arch/x86/include/asm/apic.h arch/x86/include/asm/page.h arch/x86/include/asm/processor.h arch/x86/kernel/idt.c		2011-04-14 08:40:52 +02:00
..
x86	Merge branch 'master' of git.lfbs.rwth-aachen.de:metalsvm into doxygen	2011-04-14 08:40:52 +02:00