Merge mainline into keylayouts

grub-core/loader/i386/pc/linux.c

@@ -34,6 +34,7 @@
 #include <grub/mm.h>
 #include <grub/cpu/relocator.h>
 #include <grub/video.h>
+#include <grub/i386/floppy.h>
 
 #define GRUB_LINUX_CL_OFFSET		0x9000
 #define GRUB_LINUX_CL_END_OFFSET	0x90FF
@@ -60,6 +61,8 @@ grub_linux16_boot (void)
   state.ip = 0;
 
   grub_video_set_mode ("text", 0, 0);
+
+  grub_stop_floppy ();
   
   return grub_relocator16_boot (relocator, state);
 }

grub-core/loader/i386/xnu.c

@@ -123,7 +123,6 @@ static grub_uint64_t
 guessfsb (void)
 {
   const grub_uint64_t sane_value = 100000000;
-#ifndef GRUB_MACHINE_IEEE1275
   grub_uint32_t manufacturer[3], max_cpuid, capabilities, msrlow;
   grub_uint64_t start_tsc;
   grub_uint64_t end_tsc;
@@ -209,9 +208,6 @@ guessfsb (void)
 
   return grub_divmod64 (2000 * tsc_ticks_per_ms,
 			((msrlow >> 7) & 0x3e) + ((msrlow >> 14) & 1), 0);
-#else
-  return sane_value;
-#endif
 }
 
 struct property_descriptor