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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 24 Nov 2014 19:10:09 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/media/omap24xx/tcm825x.c between commit db85a0403be4
("[media] omap24xx/tcm825x: remove deprecated omap2 camera drivers")
from the v4l-dvb tree and commit 1002a240ed72 ("staging: media:
omap24xx: Use min_t instead of min") from the staging tree.

I fixed it up (the former removed the file, so I did that) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]