From mboxrd@z Thu Jan  1 00:00:00 1970
From: s.hauer@pengutronix.de (Sascha Hauer)
Date: Tue, 10 Jan 2012 09:30:20 +0100
Subject: linux-next: please update the i.MX tree
In-Reply-To: <20120110115218.e00ab8c01abd5b9ae9a3b166@canb.auug.org.au>
References: <20120110115218.e00ab8c01abd5b9ae9a3b166@canb.auug.org.au>
Message-ID: <20120110083020.GR5446@pengutronix.de>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

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 |