]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5d1c105 312ec0a)
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)
commitcdc45116cceb0110538b12edf3d38769ee7f98d6
treef290b3e7aa9c12fdc4853ce97c150c4f9abd90a3tree | snapshot
parent5d1c105b7ef45a0b3d26bda5b5364ffd849dca82commit | diff
parent312ec0a59b756700353171566f18782cd8bbf674commit | 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
Linux Kernel Source Tree.