Merge branch 'imx/imx6q' into next/soc