Vladimir 'phcoder' Serbinenko 5e03640baf Merge branch 'mainline' into relocator ... Conflicts: loader/i386/multiboot.c		2009-08-23 01:31:12 +02:00
..
grub	Merge branch 'mainline' into relocator	2009-08-23 01:31:12 +02:00
multiboot.h	remove all trailing whitespace	2009-06-10 21:04:23 +00:00
multiboot2.h	2009-06-10 Pavel Roskin <proski@gnu.org>	2009-06-10 20:11:12 +00:00