]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge remote-tracking branch 'uml/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:24:28 +0000 (09:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:24:28 +0000 (09:24 +1000)
1  2 
arch/um/Kconfig

diff --cc arch/um/Kconfig
Simple merge