merge mainline into net

2011-12-15 20:51:35 +01:00 · 2011-12-15 20:51:35 +01:00 · bd67ad0f70
commit bd67ad0f70
parent 078d2b2e68 c17e546cca
335 changed files with 22289 additions and 5940 deletions
--- a/grub-core/net/drivers/ieee1275/ofnet.c
+++ b/grub-core/net/drivers/ieee1275/ofnet.c
@ -115,7 +115,7 @@ static struct grub_net_card_driver ofdriver =

 static const struct
 {
-  char *name;
+  const char *name;
  int offset;
 }