Merge mainline into newreloc

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-17 19:18:46 +01:00
commit 88d2919b7d
30 changed files with 213 additions and 161 deletions

View file

@ -64,7 +64,6 @@ grub_linux16_boot (void)
return grub_relocator16_boot (relocator, state);
}
static grub_err_t
grub_linux_unload (void)
{