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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc crypto/Kconfig
Simple merge

diff --cc drivers/mtd/nand/Kconfig
Simple merge

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

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