merge mainline into net

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-02 18:52:50 +02:00
commit 03a0046581
45 changed files with 682 additions and 233 deletions

View file

@ -206,7 +206,7 @@ grub_load_normal_mode (void)
/* Load the module. */
grub_dl_load ("normal");
/* Something went wrong. Print errors here to let user know why we're entering rescue mode. */
/* Print errors if any. */
grub_print_error ();
grub_errno = 0;