From: Bjørn Mork <bjorn@xxxxxxx> Date: Thu, 20 Sep 2012 09:18:05 +0200 > This is the net-next version of the previously posted patch with the > same title. I totally forgot that I had messed with the .driver_info > fields, making it impossible to apply the same patch to both net and > net-next. > > Sorry about that. Please apply this version to net-next. The other > one should still be applied to net (if still possible) and stable. Ok I applied this to net-next, and it should help with the merge resolution between net and net-next, which BTW Stephen Rothwell already had to deal with. -- 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