Merge branches 'fixes' and 'misc' into for-linus
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Fri, 1 Apr 2022 15:12:31 +0000 (16:12 +0100)
1  2 
arch/arm/mach-s3c/mach-jive.c
lib/Kconfig

Simple merge
diff --cc lib/Kconfig
Simple merge