Merge branches 'fixes' and 'misc' into for-linus

author Russell King (Oracle) <[email protected]>

Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)

committer Russell King (Oracle) <[email protected]>

Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
author Russell King (Oracle) <[email protected]>
Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
committer Russell King (Oracle) <[email protected]>
Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
diff --cc arch/arm/mach-s3c/mach-jive.c
Simple merge
diff --cc lib/Kconfig
Simple merge
author	Russell King (Oracle) <[email protected]>
	Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
committer	Russell King (Oracle) <[email protected]>
	Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
		1	2
arch/arm/mach-s3c/mach-jive.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history