merge mainline into mips

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

No files matched your search

+2 -2
View File
@@ -414,8 +414,8 @@ static grub_command_t cmd;
GRUB_MOD_INIT(mmap)
{
cmd = grub_register_command ("badram", grub_cmd_badram,
"badram ADDR1,MASK1[,ADDR2,MASK2[,...]]",
"declare memory regions as badram");
"ADDR1,MASK1[,ADDR2,MASK2[,...]]",
"Declare memory regions as badram.");
}
GRUB_MOD_FINI(mmap)