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:56 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/dabusb/dabusb.c and drivers/staging/dabusb/dabusb.h
between commit f8f4a7f5c1219571acf55f3889138b594e5b3b68 ("[media] dabusb:
remove obsolete driver") from the v4l-dvb tree and commit
868788278eaa5b841ec1a810b41e156f5fba0ab5 ("Staging: dabusb: fixed coding
style issues") from the staging tree.

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