Message ID | 20111025091032.GT23421@pengutronix.de |
---|---|
State | New |
Headers | show |
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