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

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-ep93xx.c
Simple merge

diff --cc drivers/spi/spi-mpc512x-psc.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-sh-hspi.c
Simple merge

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