Merge remote-tracking branch 'spi/topic/core' into spi-next

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

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

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

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

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

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

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

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

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

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

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

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

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