On Fri, Mar 04, 2011 at 04:38:41PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/usbvideo/usbvideo.c between commit
> af6302700e87a883481c342001ef81b77641bf98 ([media] staging-usbvideo:
> remove"") from the v4l-dvb tree and commit ("Staging: usbvideo:
> usbvideo: fixed some coding style issues") from the staging tree.
>
> I removed the file.
Thanks, that's the correct thing to do.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
