merge mainline into nestpart

partmap/acorn.c

@@ -134,12 +134,12 @@ static struct grub_partition_map grub_acorn_partition_map =
   .iterate = acorn_partition_map_iterate,
 };
 
-GRUB_MOD_INIT(acorn_partition_map)
+GRUB_MOD_INIT(part_acorn)
 {
   grub_partition_map_register (&grub_acorn_partition_map);
 }
 
-GRUB_MOD_FINI(acorn_partition_map)
+GRUB_MOD_FINI(part_acorn)
 {
   grub_partition_map_unregister (&grub_acorn_partition_map);
 }