xloader: unification more merge cleaning allowing
authorAndy Green <andy.green@linaro.org>
Sun, 20 Feb 2011 08:58:57 +0000 (08:58 +0000)
committerAndy Green <andy.green@linaro.org>
Sun, 20 Feb 2011 08:58:57 +0000 (08:58 +0000)
commitd670f99da8d718838ec8efa5af7f87f49609657d
tree4315958c40353105143e0facf2cc28e8613ce5cf
parent81f08a7cec676da2a6d001ad3c69d04c6f4bd500
xloader: unification more merge cleaning allowing
omap4430panda config to build cleanly to a working
MLO

Signed-off-by: Andy Green <andy.green@linaro.org>
board/omap4430panda/clock.c
board/omap4430panda/omap4430panda.c
config.mk
cpu/omap4/Makefile
cpu/omap4/cpu.c
cpu/omap4/mmc.c
cpu/omap4/mmc_protocol.h
include/asm/arch-omap4/cpu.h
include/asm/arch-omap4/mem.h
include/configs/omap4430panda.h
lib/board.c