Merge commit 'a7d2475af7aedcb9b5c6343989a8bfadbf84429b' into uaccess.powerpc

backmerge of sorting the arch/powerpc/Kconfig