metalsvm/arch/x86/kernel
Marian Ohligs 94a98c5950 Merge branch 'master' into ohligs
Conflicts:
	kernel/tasks.c
2011-07-30 19:21:25 +02:00
..
apic.c Merge branch 'master' into ohligs 2011-07-27 10:36:51 +02:00
entry.asm Merge branch 'master' into ohligs 2011-07-30 19:21:25 +02:00
gdt.c merge master 2011-07-27 10:28:01 +02:00
idt.c merge master 2011-07-27 10:28:01 +02:00
irq.c Merge branch 'master' into ohligs 2011-07-30 19:21:25 +02:00
isrs.c merge master 2011-07-27 10:28:01 +02:00
kb.c merge master 2011-07-27 10:28:01 +02:00
Makefile merge master 2011-07-27 10:28:01 +02:00
multiboot.c merge master 2011-07-27 10:28:01 +02:00
pci.c merge master 2011-07-27 10:28:01 +02:00
pcihdr.h merge master 2011-07-27 10:28:01 +02:00
processor.c merge master 2011-07-27 10:28:01 +02:00
string.asm merge master 2011-07-27 10:28:01 +02:00
timer.c merge master 2011-07-27 10:28:01 +02:00
vga.c merge master 2011-07-27 10:28:01 +02:00