Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/dvb/ttpci/budget.c between commit
6f550dc08369ee0bc6402963c377e65f0f2e3b71 ("V4L/DVB: budget: Oops: "BUG:
unable to handle kernel NULL pointer 	dereference"") from Linus'
tree and commit 2bf92108b679637c2e50114f4c655d7cc608a1d9 ("[v2, for,
v4l-dvb, 	master] V4L/DVB: budget: Oops: "BUG: unable to handle
kernel NULL 	pointer dereference"") from the v4l-dvb tree.

I just used the version of that file from the v4l-dvb tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/