merge mainline into mbtag
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 7 Mar 2010 12:01:43 +0000 (13:01 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sun, 7 Mar 2010 12:01:43 +0000 (13:01 +0100)
commit3f5a90c616bc19154aa0b4ffcf644a71f44316c6
treea7f1c11ed17e206d7137ae7b71f6d0627bb36fdc
parent1c4ad986aa89b41f8478ae94689557f362c9fe82
parentfce5d8ff62d3deb264ba5916b62df69998caf916
merge mainline into mbtag
conf/i386.rmk
include/grub/multiboot.h
include/multiboot2.h
loader/i386/multiboot.c
loader/i386/multiboot_mbi.c
loader/i386/multiboot_mbi2.c