Messages in this thread | | | Date | Wed, 29 Feb 2012 14:33:59 +1100 | 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-tv/hdmi_drv.c due to commit 382d19f197f9 ("media: Fix typo in mixer_drv.c and hdmi_drv.c") from the trivial tree also already existing in the v4l-dvb tree (same patch different commit) (and there are further changes in that tree to this file).
I just the used the version from the v4l-dvb tree.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |