Merge branch 'dt/gic' into imx/imx6q