]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge branch 'for-5.11-null-console' into for-linus
authorPetr Mladek <pmladek@suse.com>
Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
committerPetr Mladek <pmladek@suse.com>
Mon, 14 Dec 2020 14:14:57 +0000 (15:14 +0100)
1  2 
init/main.c
kernel/printk/printk.c

diff --cc init/main.c
Simple merge
Simple merge