Merge remote-tracking branch 'spi/fix/atmel' into spi-linus