Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/dvb/frontends/drx397xD.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit a8e8541bc7af ("Remove
the now obsolete drx397xD") from the v4l-dvb tree.

The latter removed the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/