]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:08:10 +0000 (09:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 May 2021 23:08:10 +0000 (09:08 +1000)
commit29ec3b84318eb81197c9dea1137ae30685e0a612
treef47085d041bf3bccf78a8327c3025e9a655935f5
parent91e09a02f9e19ea96c751187ac99abeae2918591
parentc6b05f4e233cc666f003e9fe68b2f765952875a9
Merge remote-tracking branch 'powerpc/next'

# Conflicts:
# arch/powerpc/Kconfig
Documentation/admin-guide/kernel-parameters.txt
arch/powerpc/Kconfig