merge mainline into mips

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-28 01:05:47 +01:00
commit 742e1f7e72
75 changed files with 534 additions and 768 deletions

View file

@ -349,9 +349,9 @@ static grub_command_t cmd_linux, cmd_initrd;
GRUB_MOD_INIT(linux)
{
cmd_linux = grub_register_command ("linux", grub_cmd_linux,
0, "load a linux kernel");
0, "Load Linux.");
cmd_initrd = grub_register_command ("initrd", grub_cmd_initrd,
0, "load an initrd");
0, "Load initrd.");
my_mod = mod;
}