On 03/30/2013 05:11 PM, Alexander Shishkin wrote: > Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx> writes: > >> On 03/30/2013 01:46 AM, 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 >> >> You've hopefully resolved the conflict before creating a this patch, so >> remove this line :) > > Thanks, captain! :) See the v2 series. I started to read my inbox from older to newer mails and send this before discovering you had already send a v2. sorry for the noise, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature
