linux-next: manual merge of the trivial tree with the v4l-dvb tree

From: Stephen Rothwell
Date: Tue Jul 06 2010 - 01:25:54 EST

Next message: Davidlohr Bueso: "[PATCH reiserfs] trivial typo fix"
Previous message: Srikar Dronamraju: "Re: [Bugfix] unregister_trace_probe needs to be called under mutex"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature

Next message: Davidlohr Bueso: "[PATCH reiserfs] trivial typo fix"
Previous message: Srikar Dronamraju: "Re: [Bugfix] unregister_trace_probe needs to be called under mutex"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]