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

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

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

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

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

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