linux-next: manual merge of the spi tree with the mpc5xxx tree

Hi Mark, Today's linux-next merge of the spi tree got a conflict in drivers/spi/spi-mpc512x-psc.c between commit 9d37619fb37f ("spi: mpc512x: adjust to OF based clock lookup") from the mpc5xxx tree and commit e1d0cd473be4 ("spi: mpc512x: Use devm_*() functions") from the spi tree. I fixed it up

linux-next: manual merge of the spi tree with the mpc5xxx tree

Hi Mark, Today's linux-next merge of the spi tree got a conflict in drivers/spi/spi-mpc512x-psc.c between commit 9d37619fb37f (spi: mpc512x: adjust to OF based clock lookup) from the mpc5xxx tree and commit e1d0cd473be4 (spi: mpc512x: Use devm_*() functions) from the spi tree. I fixed it up (see