Merge remote-tracking branches 'spi/topic/coldfire' and 'spi/topic/dw' into spi-next