mirror of
https://github.com/torvalds/linux.git
synced 2026-05-14 05:42:10 -04:00
f96271cefe
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.