Merge remote-tracking branch 'tip/auto-latest'

diff --cc MAINTAINERS
Simple merge

diff --cc arch/mips/include/asm/pgtable.h
Simple merge

diff --cc arch/s390/include/asm/pgtable.h
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

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

diff --cc kernel/time/tick-sched.c
Simple merge