Merge mainline into newreloc
This commit is contained in:
commit
2a1d16154d
160 changed files with 6853 additions and 2250 deletions
|
@ -68,6 +68,9 @@ grub_exit (void)
|
|||
void
|
||||
grub_machine_init (void)
|
||||
{
|
||||
#ifdef GRUB_MACHINE_QEMU
|
||||
grub_qemu_init_cirrus ();
|
||||
#endif
|
||||
/* Initialize the console as early as possible. */
|
||||
grub_vga_text_init ();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue