[U-Boot-Users] [PATCH] mpc83xx: Fix the fatal conflict of merge

[Kim Phillips]

On Thu, 17 Jan 2008 18:35:52 +0800
Dave Liu <r63238 at freescale.com> wrote:

> > 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?
> 
applied.

WD, if you care to wait I'm about to send YAPR (Yet Another Pull
Request).

Kim