From: Manoel Rebelo Abranches <mrabran@br.ibm.com>
Date: Thu, 5 May 2011 15:12:22 +0000 (-0300)
Subject: Merge mainline.
X-Git-Tag: 2.00~1195^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90eb90e24c5fc37d61b4535a7a242c28e6eb0de5;p=thirdparty%2Fgrub.git

Merge mainline.
---

90eb90e24c5fc37d61b4535a7a242c28e6eb0de5
diff --cc grub-core/commands/ls.c
index 9bccda349,5fc648a9b..20a75733c
--- a/grub-core/commands/ls.c
+++ b/grub-core/commands/ls.c
@@@ -31,8 -31,9 +31,10 @@@
  #include <grub/extcmd.h>
  #include <grub/datetime.h>
  #include <grub/i18n.h>
 +#include <grub/net.h>
  
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
  static const struct grub_arg_option options[] =
    {
      {"long", 'l', 0, N_("Show a long list with more detailed information."), 0, 0},
diff --cc include/grub/err.h
index 211fafa70,69bc6ec79..40f39dd5d
--- a/include/grub/err.h
+++ b/include/grub/err.h
@@@ -56,10 -56,7 +56,11 @@@ typedef enu
      GRUB_ERR_IO,
      GRUB_ERR_ACCESS_DENIED,
      GRUB_ERR_EXTRACTOR,
 +    GRUB_ERR_NET_BAD_ADDRESS,
 +    GRUB_ERR_NET_ROUTE_LOOP,
 +    GRUB_ERR_NET_NO_ROUTE,
-     GRUB_ERR_WAIT
++    GRUB_ERR_WAIT,
+     GRUB_ERR_BUG
    }
  grub_err_t;