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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 14 Oct 2008 18:28:46 +1100

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a lot of conflicts
against Linus' tree.  It looks like it has been rebased and has
cheery-picked a lot of commits from Linus' tree.  However it got into
this state, it needs a major fixup.

I have dropped it for today.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/