]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:24:22 +0000 (09:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:24:22 +0000 (09:24 +1000)
commit0b2f92969a26ff099f6293afc75d330d8103a65e
tree7d57e0cd2c12d94d784f67780488e89877fdc829
parent94670c739dc019f62932e6dc55a1b16da38a1894
parente432fe97f3e5de325b40021e505cce53877586c5
Merge remote-tracking branch 'powerpc/next'

# Conflicts:
# arch/powerpc/sysdev/xive/common.c
15 files changed:
MAINTAINERS
arch/powerpc/Kconfig
arch/powerpc/include/asm/ptrace.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/iommu.c
arch/powerpc/kernel/prom.c
arch/powerpc/kernel/prom_init.c
arch/powerpc/kernel/time.c
arch/powerpc/kernel/traps.c
arch/powerpc/platforms/pasemi/idle.c
arch/powerpc/platforms/pseries/setup.c
arch/powerpc/sysdev/xive/common.c
drivers/cpufreq/powernv-cpufreq.c
kernel/irq/irqdomain.c
scripts/mod/modpost.c