projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32b48bf dd86005)
Merge branch 'master' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Sat, 8 May 2021 11:12:55 +0000 (21:12 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Sat, 8 May 2021 11:12:55 +0000 (21:12 +1000)
commitf96271cefe6dfd1cb04195b76f4a33e185cd7f92
treef290b3e7aa9c12fdc4853ce97c150c4f9abd90a3tree | snapshot
parent32b48bf8514c28cdc89cd8069eceeb6e6cff0612commit | diff
parentdd860052c99b1e088352bdd4fb7aef46f8d2ef47commit | diff
Merge branch 'master' into next

Merge master back into next, this allows us to resolve some conflicts in
arch/powerpc/Kconfig, and also re-sort the symbols under config PPC so
that they are in alphabetical order again.
Documentation/admin-guide/kernel-parameters.txt diff1 | diff2 | blob | history
arch/powerpc/Kconfig diff1 | diff2 | blob | history
Domain: System / Kernel;