Merge remote-tracking branches 'spi/fix/complete', 'spi/fix/efm32', 'spi/fix/omap2...

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

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

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

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

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

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

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