Messages in this thread | | | Date | Sun, 11 Jul 2010 22:41:48 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: linux-next: manual merge of the trivial tree with the v4l-dvb tree |
| |
On Tue, 6 Jul 2010, Stephen Rothwell wrote:
> Hi Jiri, > > Today's linux-next merge of the trivial tree got a conflict in > drivers/media/video/ov511.c between commit > b2bde15c455d09057dc7bd9f5b9ed67b9ac99b8a ("V4L/DVB: Remove obsolete ov511 > driver") from the v4l-dvb tree and commit > 421f91d21ad6f799dc7b489bb33cc560ccc56f98 ("fix typos concerning "initiali > [zs]e"") from the trivial tree. > > The former just removes the file, so I removed it.
Hi Stephen,
thanks for reporting it, I have reverted the drivers/media/video/ov511.c hunk.
-- Jiri Kosina SUSE Labs, Novell Inc.
| |