Re: linux-next: please update the i.MX tree

[Sascha Hauer]

On Tue, Jan 10, 2012 at 11:52:18AM +1100, Stephen Rothwell wrote:
> Hi Sascha,
> 
> It looks like most (if not all) of the i.MX tree has been merged into the
> arm-soc (and Linus') tree, so could you please update the i.MX tree to
> eliminate the conflicts I am getting.

Did this. Sorry, I was not aware that there is something in this branch.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
--
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/