Merge pull request #20776 from medhefgo/boot-timeout

author Lennart Poettering <lennart@poettering.net>

Mon, 11 Oct 2021 21:05:37 +0000 (23:05 +0200)

committer GitHub <noreply@github.com>

Mon, 11 Oct 2021 21:05:37 +0000 (23:05 +0200)
author Lennart Poettering <lennart@poettering.net>
Mon, 11 Oct 2021 21:05:37 +0000 (23:05 +0200)
committer GitHub <noreply@github.com>
Mon, 11 Oct 2021 21:05:37 +0000 (23:05 +0200)
diff --cc src/boot/bootctl.c
Simple merge
diff --cc src/boot/efi/boot.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Mon, 11 Oct 2021 21:05:37 +0000 (23:05 +0200)
committer	GitHub <noreply@github.com>
	Mon, 11 Oct 2021 21:05:37 +0000 (23:05 +0200)
		1	2
src/boot/bootctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/boot/efi/boot.c	patch \|	diff1 \|	diff2 \|	blob \| history