Merge branch 'master' into desktop

patch/misc/0007-bootsplash.patch

@@ -2,15 +2,14 @@ diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
 index f4166263bb3a..a248429194bb 100644
 --- a/drivers/tty/vt/keyboard.c
 +++ b/drivers/tty/vt/keyboard.c
-@@ -47,6 +47,8 @@
- 
- #include <asm/irq_regs.h>
+@@ -28,6 +28,7 @@
+  * 21-08-02: Converted to input API, major cleanup. (Vojtech Pavlik)
+  */
  
 +#include <linux/bootsplash.h>
-+
- extern void ctrl_alt_del(void);
+ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
- /*
+ #include <linux/consolemap.h>
 @@ -1353,6 +1355,28 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
  	}
  #endif