Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in:
drivers/media/v4l2-core/videobuf2-memops.c
between commit:
6690c8c78c74 ("[media] media: vb2: Remove unused functions")
from the v4l-dvb tree and commit:
e1c05067c323 ("treewide: fix typos in comment blocks")
from the trivial tree.
I fixed it up (the former removed the code modified by the latter)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
