From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Liu <r63238@freescale.com>
Date: Thu, 17 Jan 2008 18:35:52 +0800
Subject: [U-Boot-Users] [PATCH] mpc83xx: Fix the fatal conflict of merge
In-Reply-To: <1200565399.3656.2.camel@localhost.localdomain>
References: <1200565399.3656.2.camel@localhost.localdomain>
Message-ID: <1200566152.3656.12.camel@localhost.localdomain>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

> The commit 9e89647889cd4b5ada5b5e7cad6cbe55737a08d7
> will cause the mpc8315erdb board can't boot up.

Hi Wolfgang,

I don't know when the merge window will close today,
Because the patch fix the fatal conflict, I wish it
can be merged to main tree in this window.

If Kim can not take the patch to 83xx tree and request to you
before the window close, could you apply it to main tree directly?

Thank you very much,
Dave