From mboxrd@z Thu Jan  1 00:00:00 1970
From: arnd@arndb.de (Arnd Bergmann)
Date: Sun, 30 Oct 2011 21:45:50 +0200
Subject: [GIT PULL] i.MX5 devicetree support
In-Reply-To: <20111025091032.GT23421@pengutronix.de>
References: <20111025091032.GT23421@pengutronix.de>
Message-ID: <201110302045.50139.arnd@arndb.de>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Tuesday 25 October 2011, Sascha Hauer wrote:
> Please pull the following. It contains devicetree support for i.MX5
> based systems. You can use the following to resolve the merge conflicts
> against your for-next branch:
> 
> git://git.pengutronix.de/git/imx/linux-2.6.git imx-dt-merge

My merge looked slightly different, but equivalent. Having the merge commit
as you did was indeed very useful.

Thanks!

	Arnd