xloader: unification fixup bulk of merge conflicts
authorAndy Green <andy@warmcat.com>
Sun, 20 Feb 2011 07:49:41 +0000 (07:49 +0000)
committerAndy Green <andy.green@linaro.org>
Sun, 20 Feb 2011 08:57:31 +0000 (08:57 +0000)
commit81f08a7cec676da2a6d001ad3c69d04c6f4bd500
treeeb1d711ae77c428d4d8885b29abbd2ab3870c692
parentdce28e4d584c4f86a31f0cb19cd4bc2b9a0b8ea9
parent9096975d5efacdc7ba2ebd047d086bdb5b2bb437
xloader: unification fixup bulk of merge conflicts

This patch cleans the merge action of bringing in the git.omapzoom.org
x-loader tree on top of the gitorious tree, unifying the two trees.

From: Andy Green <andy.green@linaro.org>
Signed-off-by: Andy Green <andy.green@linaro.org>
18 files changed:
Makefile
README
board/omap4430panda/omap4430panda.c
config.mk
cpu/omap3/mmc.c
cpu/omap4/cpu.c
cpu/omap4/start.S
drivers/k9f1g08r0a.c
drivers/onenand.c
fs/fat/fat.c
include/asm/arch-omap4/cpu.h
include/asm/arch-omap4/mem.h
include/asm/arch-omap4/mux.h
include/asm/arch-omap4/omap4430.h
include/common.h
include/configs/omap3430labrador.h
include/configs/omap4430panda.h
lib/board.c