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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 24 Nov 2014 18:31:22 +1100

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/staging/media/omap24xx/omap24xxcam.c between commit
db85a0403be4 ("[media] omap24xx/tcm825x: remove deprecated omap2 camera
drivers") from the v4l-dvb tree and commit 8c5bd8111b45 ("staging:
media: omap24xx: drop owner assignment from platform_drivers") from the
driver-core 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]