Merge branch 'devicetree/next-console' into devicetree/next