Re: [U-Boot-Users] [PATCH] 85xx: Fix merge duplication

2008-02-28 Thread Andy Fleming
On Wed, Feb 27, 2008 at 10:00 PM, Kumar Gala <[EMAIL PROTECTED]> wrote: > ft_fixup_cpu() got duplicated in some merge snafu. Remove the duplicate. > > Signed-off-by: Kumar Gala <[EMAIL PROTECTED]> Ah. This was in the for-1.3.3 tree. I've applied it. Though people should not be surprised if t

[U-Boot-Users] [PATCH] 85xx: Fix merge duplication

2008-02-27 Thread Kumar Gala
ft_fixup_cpu() got duplicated in some merge snafu. Remove the duplicate. Signed-off-by: Kumar Gala <[EMAIL PROTECTED]> --- cpu/mpc85xx/fdt.c | 49 - 1 files changed, 0 insertions(+), 49 deletions(-) diff --git a/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/f