[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the trivial tree with the v4l-dvb tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2012-02-29 3:33:59
Message-ID: 20120229143359.e983bed880aded7b8f99b6bf () canb ! auug ! org ! au
[Download RAW message or body]

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.

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[Attachment #3 (application/pgp-signature)]
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[prev in list] [next in list] [prev in thread] [next in thread]