Re: linux-next: manual merge of the usb tree with the i.MX tree

[Uwe Kleine-König]

On Fri, Feb 26, 2010 at 06:10:03PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-mx2/devices.h between commit
> 68c94b40b31926f627573a7f656b903f6644744e ("arm/mx2: use cpp magic to
> create spi_imx devices") from the i.MX tree and commit
> 3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
> resources for i.MX21 USB host controller") from the usb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.
Looks OK, thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/