On Fri, Jul 06, 2012 at 09:50:50PM +0800, gaosen wrote: > >From 86fcd5bb701bd927d588386c480c37784d10040a Mon Sep 17 00:00:00 2001 > From: Gaosen Zhang <gaosen.zhang@xxxxxxxxxxxx> > Date: Fri, 6 Jul 2012 21:44:10 +0800 > Subject: [PATCH 1/1] USB: option: Add MEDIATEK product ids > > > Signed-off-by: Gaosen Zhang <gaosen.zhang@xxxxxxxxxxxx> > --- > drivers/usb/serial/option.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) This conflicts with the patch that you sent me a few days ago which I've already applied. What is the difference and why did you rename some of the #defines? Can you please send me an incremental patch on top of the other patch that you previous sent me, so that I can properly include this one, as it looks like it does add support for a few more devices? thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
