On Tue, 6 Jul 2010, Stephen Rothwell wrote:

quoted text
> 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.
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/