| commit | f96271cefe6dfd1cb04195b76f4a33e185cd7f92 | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Sat May 08 21:12:55 2021 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Sat May 08 21:12:55 2021 +1000 |
| tree | f290b3e7aa9c12fdc4853ce97c150c4f9abd90a3 | |
| parent | 32b48bf8514c28cdc89cd8069eceeb6e6cff0612 [diff] | |
| parent | dd860052c99b1e088352bdd4fb7aef46f8d2ef47 [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.