Merge remote-tracking branch 'printk/for-next'

# Conflicts:
#	MAINTAINERS

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
index 09643ad13c6f415ba2974d25e3d2688aebeb551b,a19a104e0cc4c0e4391a80506731d7e27df03e20..f7d880dd41ebd4619efd1561fe2b26bb412bc188
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -15018,6 -14918,18 +15018,11 @@@ S: Maintaine
  F:    include/linux/printk.h
  F:    kernel/printk/
  
 -PRISM54 WIRELESS DRIVER
 -M:    Luis Chamberlain <mcgrof@kernel.org>
 -L:    linux-wireless@vger.kernel.org
 -S:    Obsolete
 -W:    https://wireless.wiki.kernel.org/en/users/Drivers/p54
 -F:    drivers/net/wireless/intersil/prism54/
 -
+ PRINTK INDEXING
+ R:    Chris Down <chris@chrisdown.name>
+ S:    Maintained
+ F:    kernel/printk/index.c
+ 
  PROC FILESYSTEM
  L:    linux-kernel@vger.kernel.org
  L:    linux-fsdevel@vger.kernel.org

diff --cc arch/openrisc/kernel/entry.S
Simple merge

diff --cc arch/powerpc/kernel/head_fsl_booke.S
Simple merge

diff --cc arch/powerpc/kernel/traps.c
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc include/linux/printk.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/trace/trace.c
Simple merge