Merge remote-tracking branches 'spi/topic/id-const', 'spi/topic/oom', 'spi/topic...

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

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

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

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