Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/media/video/s5p-fimc/fimc-capture.c between commit 2319c539e39b
("[media] s5p-fimc: Remove sensor management code from FIMC capture
driver") from the v4l-dvb tree and commit 18df7b82e25c ("treewide:
Correct spelling of successfully in comments") from the trivial tree.
The former removed the code that the latter modified.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp5qEReDwBqr.pgp
Description: PGP signature
