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

Mon, 03 Sep 2012 20:09:51 -0700 

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 tree.

I just used the version from the v4l-dvb tree and can carry that fix as
necessary (no action is required).
-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpZkxb67fUQx.pgp
Description: PGP signature

Reply via email to