Merge branch 'devicetree/merge' into spi/merge