Re: linux-next: manual merge of the usb tree with the v4l-dvb tree

[Greg KH]

On Mon, May 21, 2012 at 04:06:24PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> drivers/staging/media/easycap/easycap_main.c between various commits from
> the v4l-dvb tree and commit 5df773120477 ("USB: Staging: media: easycap:
> remove err() usage") from the usb tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

This looks correct, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/