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

> Dear Kim Phillips,
> 
> In message <20090309183845.f55f0801.kim.phill...@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
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to