Merge tag 'spi-3.6' into spi-next

spi: Updates for 3.6

Grant is still away so another pull request with some fairly minor
fixes, the most notable of which are several fixes for some common error
patterns with the reference counting spi_master_get/put do.
-

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