Messages in this thread | | | Date | Fri, 4 Mar 2011 16:38:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the staging tree with the v4l-dvb tree |
| |
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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |