On 01/25/2013 03:17 PM, Andrzej Pietrasiewicz wrote: > From: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> > > This patch converts the nokia gadget to make use of the function > framework to request the ACM function. > > The "old" include interface for acm is now removed since nokia was the > last user of it (for ACM). > > Signed-off-by: Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> > Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx> This looks correct. You should only have a clash in f_acm.c where you remove the block and git should handle everything else correctly. Please add something between mine and your sign-off that you changed my patch and rresovled a conflict, something like in http://cgit.breakpoint.cc/cgit.cgi/linux/kernel/git/torvalds/linux.git/commit/?id=bdcc61275232db897ba831f87a16df98ab248571 Sebastian -- 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
