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
..
x86	Merge branch 'stage6' of https://github.com/RWTH-OS/eduOS into stage6	2014-12-19 22:05:15 +01:00