]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge multiboot into multiboot2
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 28 Mar 2010 11:55:56 +0000 (13:55 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 28 Mar 2010 11:55:56 +0000 (13:55 +0200)
1  2 
ChangeLog
doc/boot.S
doc/kernel.c
doc/multiboot.texi
doc/multiboot2.h

diff --cc ChangeLog
Simple merge
diff --cc doc/boot.S
Simple merge
diff --cc doc/kernel.c
Simple merge
Simple merge
Simple merge