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

[Stephen Rothwell]

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree produced a mountain of
conflicts so I have used the version from next-20100512 for today.
Please either merge Linus' tree into yours or rebase you tree on top of
Linus' tree.  There are a large number of commits that are in your tree
that have been rebased before being included into Linus' tree and this
caused conflicts with further changes in your tree.

Please consider changing your work flow so that you don't rebase things
in your tree before sending them to Linus.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature