]> git.sur5r.net Git - u-boot/commit
projects / u-boot / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5893b3d) | patch
85xx: Fix merge duplication
authorKumar Gala <galak@kernel.crashing.org>
Thu, 28 Feb 2008 04:00:27 +0000 (22:00 -0600)
committerAndrew Fleming-AFLEMING <afleming@freescale.com>
Wed, 26 Mar 2008 16:43:04 +0000 (11:43 -0500)
commita5af4b358a7caa9c0aa374d4d894bf762ec37669
tree1e5ec28facc2eff201ffbd730c581a7b391fa6f3tree | snapshot
parent5893b3d0a4084f87a06a5d3dc03db91206818941commit | diff
85xx: Fix merge duplication

ft_fixup_cpu() got duplicated in some merge snafu.  Remove the duplicate.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
cpu/mpc85xx/fdt.c diff | blob | history
Cloned from git://git.denx.de/u-boot.git