On 03/30/2013 01:46 AM, Alexander Shishkin wrote:
> From: Michael Grzeschik <m.grzesc...@pengutronix.de>
> 
> 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 <feste...@gmail.com>
> Signed-off-by: Michael Grzeschik <m.grzesc...@pengutronix.de>
> Signed-off-by: Marc Kleine-Budde <m...@pengutronix.de>
> Signed-off-by: Alexander Shishkin <alexander.shish...@linux.intel.com>
> 
> Conflicts:
>       drivers/usb/chipidea/usbmisc_imx.c

You've hopefully resolved the conflict before creating a this patch, so
remove this line :)

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

Reply via email to