Merge remote-tracking branch 'devicetree/devicetree/next'

diff --cc drivers/crypto/caam/ctrl.c
Simple merge

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