Merge branch 'devicetree/next' into spi/next

To pick up removal of #ifdef around .of_match_table