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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpwnH8MxGLvg.pgp
Description: PGP signature
