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

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/Kconfig between commit
c0efd232929c2cd87238de2cccdaf4e845be5b0c ("V4L/DVB (8145a): USB Video
Class driver") from Linus' tree (which is also in the v4l-dvb tree) and
commit 2f70db892654f1e3c65c527e00a8982166142020 ("V4L/DVB (8152): Initial
release of gspca with only one driver") from the v4l-dvb tree.

Just a case of overlapping additions.

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