Michael Ellerman f96271cefe 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.
2021-05-08 21:12:55 +10:00
..
2021-05-03 12:58:31 -07:00
2021-05-03 11:19:54 -07:00
2021-05-03 11:19:54 -07:00
2021-05-08 21:12:55 +10:00
2021-05-07 11:29:23 -07:00