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

diff --cc drivers/gpio/gpiolib-of.c
Simple merge

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

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

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

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