Merge branch 'qca7000_spi'