]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'printk/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:55:20 +0000 (09:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 1 Sep 2021 23:55:20 +0000 (09:55 +1000)
commitacc908e59f9f8bb903e3ca679ddee29fe99e4820
tree4c9dec0143940ddf8542542f5f747b1f86d940e7
parentd53b7acfe48b4c2d69cf6e4dd283ae9b57d6c919
parentc5734343117072faffd0b188e4fbc0a53ad165b5
Merge remote-tracking branch 'printk/for-next'

# Conflicts:
# MAINTAINERS
Documentation/admin-guide/kernel-parameters.txt
MAINTAINERS
arch/openrisc/kernel/entry.S
arch/powerpc/kernel/head_fsl_booke.S
arch/powerpc/kernel/traps.c
drivers/base/core.c
include/asm-generic/vmlinux.lds.h
include/linux/printk.h
init/Kconfig
kernel/trace/trace.c