automerging branch "kernel.org-palmer-linux/wip-timer" into "riscv-all"

# Conflicts:
#	arch/riscv/kernel/setup.c
#	arch/riscv/kernel/smpboot.c