]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 438d361 97121f5)
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)
commitcc67fd377466301572aab9734a7d4038a0e8aa59
treef290b3e7aa9c12fdc4853ce97c150c4f9abd90a3tree | snapshot
parent438d361a1fd42bd0ed010919b5fa3caa640d709fcommit | diff
parent97121f586fd28413049e518f1df80a07514d5749commit | 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.