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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 30 Jun 2008 14:49:04 +1000

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a trivial conflict in
drivers/media/video/em28xx/em28xx-cards.c between commit
b38cc642000f0a262db367ffb95cd02ca2ead59b (V4L/DVB (8011): em28xx: enable
DVB for HVR-900"") from Linus' tree (which also exists in the dvb-v4l
tree) and commit bcb323c2fc5555307589386bffc58abd2a397661 ("V4L/DVB
(8006): em28xx: Split HVR900 into two separate entries") from the v4l-dvb
tree.

Same comments as the other conflict.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/