On Fri, Mar 04, 2011 at 04:38:49PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/usbvideo/vicam.c between commit
> af6302700e87a883481c342001ef81b77641bf98 ("[media] staging-usbvideo:
> remove") from the v4l-dvb tree and commits
> 046d747e0d2cb597e0b6fa4a79c32b43e97ed792 ("Staging: usbvideo: vicam:
> fixed some coding style issues") and
> 38a26ef272d8a93c88de54d8d3bd14ac3ce36056 ("staging: usbvideo: vicam: Fix
> build in -next") from the staging tree.
>
> I removed the file.
thanks for doing this.
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
