From mboxrd@z Thu Jan  1 00:00:00 1970
From: Kim Phillips <kim.phillips@freescale.com>
Date: Mon, 9 Mar 2009 19:32:32 -0500
Subject: [U-Boot] Please pull u-boot-mpc83xx.git
In-Reply-To: <20090309234541.50B1E832E8B8@gemini.denx.de>
References: <20090305185343.fe92230c.kim.phillips@freescale.com>
	<20090308233916.20651832E8B8@gemini.denx.de>
	<20090309183845.f55f0801.kim.phillips@freescale.com>
	<20090309234541.50B1E832E8B8@gemini.denx.de>
Message-ID: <20090309193232.0f4302f0.kim.phillips@freescale.com>
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

On Tue, 10 Mar 2009 00:45:41 +0100
Wolfgang Denk <wd@denx.de> wrote:

> Dear Kim Phillips,
> 
> In message <20090309183845.f55f0801.kim.phillips@freescale.com> you wrote:
> > argh, the fact that Heiko had already applied this to his tree slipped
> > me.  Apologies to both you and Heiko.
> 
> No problem. Were you able to check if I resolved the merge conflicts
> correctly?

everything appears to be intact.

Kim