spi changes queued up for v3.3 merge window
Merge branch 'spi/next' (early part) into spi/merge