Merge branch 'master' of git://git.denx.de/u-boot
authorKyungmin Park <kyungmin.park@samsung.com>
Tue, 21 Jul 2009 00:28:17 +0000 (09:28 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Tue, 21 Jul 2009 00:28:17 +0000 (09:28 +0900)
commit9a37584e071ec11a5618644e5b514173d9b3cdeb
treeacd2d8689f21bd06f4f5bea7928a9ae3ea45ccdc
parentb447e700ab54e5d266eaaeb43c4387e385691658
parentb86b85e2611d57d834795a92453431a1a340c3c9
Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:

Makefile
common/env_onenand.c
cpu/arm_cortexa8/cpu.c
cpu/arm_cortexa8/omap3/Makefile
cpu/arm_cortexa8/omap3/cache.c

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
12 files changed:
Makefile
board/samsung/universal/onenand.c
common/Makefile
common/env_onenand.c
cpu/arm_cortexa8/config.mk
cpu/arm_cortexa8/s5pc100/interrupts.c
cpu/arm_cortexa8/start.S
drivers/mtd/onenand/Makefile
drivers/mtd/onenand/s3c-onenand.c
drivers/serial/Makefile
include/configs/s5pc100_universal.h
onenand_ipl/onenand_read.c