merge mainline into asprintf

include/grub/font.h

@@ -75,8 +75,7 @@ void grub_font_loader_init (void);
 
 /* Load a font and add it to the beginning of the global font list.
    Returns: 0 upon success; nonzero upon failure.  */
-int
-grub_font_load (const char *filename);
+int grub_font_load (const char *filename);
 
 /* Get the font that has the specified name.  Font names are in the form
    "Family Name Bold Italic 14", where Bold and Italic are optional.

include/grub/x86_64/at_keyboard.h

@@ -0,0 +1 @@
+#include <grub/i386/at_keyboard.h>