On Sat, Mar 30, 2013 at 02:46:28AM +0200, Alexander Shishkin wrote: > From: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> > > This driver will be used for every Freescale SoC which has this misc > memory layout to control the basic usb handling. So better name this > driver, function and struct names in a more generic way. > > Reported-by: Fabio Estevam <festevam@xxxxxxxxx> > Signed-off-by: Michael Grzeschik <m.grzeschik@xxxxxxxxxxxxxx> > Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> > Signed-off-by: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx> > > Conflicts: > drivers/usb/chipidea/usbmisc_imx.c What does this mean? Why are these two lines in the changelog area? Hint, be more careful when using git rebase, and double check what you send me, before you send it. I'm stopping here, please redo this series as mentioned. 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
