Messages in this thread | | | Date | Tue, 27 Sep 2011 14:23:20 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the trivial tree with the v4l-dvb tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |