merge mainline into keylayouts

diff --cc term/at_keyboard.c
index f8595a41acf70333f07dbbb2c822351e6143a743,25f32a0a5bc8621d49ccea5efcb2d524f6af018b..2b7dd9bee1fce93b1b6709703b535327aeede9a8
--- 1/term/at_keyboard.c
--- 2/term/at_keyboard.c
+++ b/term/at_keyboard.c
@@@ -149,22 -181,17 +149,16 @@@ grub_at_keyboard_getkey_noblock (void
    switch (code)
      {
        case CAPS_LOCK:
-       /* Caps lock sends scan code twice.  Get the second one and discard it.  */
-       while (grub_keyboard_getkey () == -1);
- 
 -      at_keyboard_status ^= KEYBOARD_STATUS_CAPS_LOCK;
 +      at_keyboard_status ^= GRUB_TERM_STATUS_CAPS;
        led_status ^= KEYBOARD_LED_CAPS;
        keyboard_controller_led (led_status);
  
  #ifdef DEBUG_AT_KEYBOARD
        grub_dprintf ("atkeyb", "caps_lock = %d\n", !!(at_keyboard_status & KEYBOARD_STATUS_CAPS_LOCK));
  #endif
 -      key = -1;
 -      break;
 +      return -1;
        case NUM_LOCK:
-       /* Num lock sends scan code twice.  Get the second one and discard it.  */
-       while (grub_keyboard_getkey () == -1);
- 
 -      at_keyboard_status ^= KEYBOARD_STATUS_NUM_LOCK;
 +      at_keyboard_status ^= GRUB_TERM_STATUS_NUM;
        led_status ^= KEYBOARD_LED_NUM;
        keyboard_controller_led (led_status);