Merge remote-tracking branches 'spi/fix/pxa2xx' and 'spi/fix/qup' into spi-linus