On Wed, May 12, 2010 at 03:57:50PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/media/video/gspca/gspca.c between commit > 659a02869f4a8be95df9efa76af02e53e400555f ("V4L/DVB: gspca - main: Convert > wMaxPacketSize from little endian 16 to cpu") from the v4l-dvb tree and > commit 42b4658241d4c16c838daf9d63c0029cd7269fe0 ("USB: rename > usb_buffer_alloc() and usb_buffer_free() users") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary. The fix looks great to me, thanks. 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