Merge branch 'master' into arm_coreboot

diff --cc grub-core/kern/arm/coreboot/init.c
index f2fc589419ef085136165c261b183d8b18a69779,aec75c672a24346466fd92afacd81a382a42350e..0c021697f091baa06b28c13c0202f22de130603b
--- 1/grub-core/kern/arm/coreboot/init.c
--- 2/grub-core/kern/arm/coreboot/init.c
+++ b/grub-core/kern/arm/coreboot/init.c
@@@ -153,9 -133,6 +153,8 @@@ grub_machine_init (void
    grub_fdtbus_init (dtb, dtb_size);
  
    grub_machine_timer_init ();
-   grub_machine_timer_init ();
 +  grub_cros_init ();
 +  grub_pl050_init ();
  }
  
  void