linux-next: manual merge of the mips tree with the imx-mxs tree

Hi Ralf, Today's linux-next merge of the mips tree got a conflict in drivers/clk/Makefile between commit 33156149fc4a ("ARM: imx: move clock drivers into drivers/clk") from the imx-mxs tree and commit 66ab9263a018 ("clk: ingenic: add driver for Ingenic SoC CGU clocks") from the mips tree. I fixed

linux-next: manual merge of the mips tree with the imx-mxs tree

Hi Ralf, Today's linux-next merge of the mips tree got a conflict in drivers/irqchip/Makefile between commit 0494e11aafc7 ("irqchip: vf610-mscm-ir: Add support for Vybrid MSCM interrupt router") from the imx-mxs tree and commit 8a1a20290487 ("IRQCHIP: Add new driver for BCM7038-style level 1 inter