Stefan Lankes 0192f70338 Merge branch 'stage6' of https://github.com/RWTH-OS/eduOS into stage6 ... Conflicts: Makefile.example arch/x86/kernel/uart.c		2014-12-19 22:05:15 +01:00
..
include/asm	add helper functions to determine if the pci device use MMIO or IO ports	2014-12-19 11:35:24 +01:00
kernel	Merge branch 'stage6' of https://github.com/RWTH-OS/eduOS into stage6	2014-12-19 22:05:15 +01:00
mm	use flag PG_GLOBAL to map the video memory	2014-12-14 23:41:24 +01:00