Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sg', 'spi/topic/sh...

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

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