Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --cc drivers/spi/spi-omap-uwire.c
Simple merge

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge

diff --cc drivers/spi/spi-pxa2xx.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge