linux-next: manual merge of the v4l-dvb tree with the arm tree

Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit 895576427dca ("ARM: iMX: visstrim_m10: use arm_memblock_steal") from the arm tree and commit b6c14dc29757 ("[media] Visstrim M10: Add support for Coda") from the

linux-next: manual merge of the v4l-dvb tree with the arm tree

Hi Mauro, Today's linux-next merge of the v4l-dvb tree got a conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c between commit 895576427dca (ARM: iMX: visstrim_m10: use arm_memblock_steal) from the arm tree and commit b6c14dc29757 ([media] Visstrim M10: Add support for Coda) from the v4l-dvb