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

Prev: [PATCH]ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
Next: [PATCH reiserfs] trivial typo fix

From: Stephen Rothwell on 6 Jul 2010 01:30

---

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(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

 | 
Pages: 1
Prev: [PATCH]ipmi:ipmi_si_intf.c Fix warning: variable 'addr_space' set but not used
Next: [PATCH reiserfs] trivial typo fix