Merge tags 'devicetree-for-linus' and 'spi-for-linus' of git://git.secretlab.ca/git...