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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 4 Mar 2011 16:38:49 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/usbvideo/vicam.c between commit
af6302700e87a883481c342001ef81b77641bf98 ("[media] staging-usbvideo:
remove") from the v4l-dvb tree and commits
046d747e0d2cb597e0b6fa4a79c32b43e97ed792 ("Staging: usbvideo: vicam:
fixed some coding style issues") and
38a26ef272d8a93c88de54d8d3bd14ac3ce36056 ("staging: usbvideo: vicam: Fix
build in -next") from the staging tree.

I removed the file.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/