Merge branch 'master' of git://git.denx.de/u-boot
authorMinkyu Kang <mk7.kang@samsung.com>
Thu, 29 Jul 2010 00:13:29 +0000 (09:13 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Thu, 29 Jul 2010 00:13:29 +0000 (09:13 +0900)
commit0c0d08308e91fdb04ebfeec97729a8552a4544e0
tree4a766970ef956743b3560cc684670609121544a3
parenta0731fe805762a5b11b1649ec9143f7600cc8121
parent7385c28e9b5f7d47e6a8f1ad9800e6e70af714e2
Merge branch 'master' of git://git.denx.de/u-boot

Conflicts:
common/cmd_onenand.c
common/cmd_ubi.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
24 files changed:
Makefile
arch/arm/cpu/armv7/cpu.c
arch/arm/cpu/armv7/s5pc1xx/Makefile
arch/arm/cpu/armv7/s5pc1xx/cpu_info.c
arch/arm/cpu/armv7/s5pc1xx/i2c-gpio.c
arch/arm/cpu/armv7/s5pc1xx/sleep.c
arch/arm/cpu/armv7/s5pc1xx/sleep.h
arch/arm/cpu/armv7/s5pc1xx/sleep_asm.S
arch/arm/cpu/armv7/s5pc1xx/timer.c
arch/arm/cpu/armv7/s5pc1xx/usb-hs-otg.c
arch/arm/cpu/armv7/s5pc1xx/usb-hs-otg.h
arch/arm/cpu/armv7/s5pc1xx/usb_downloader.c
arch/arm/cpu/armv7/start.S
board/samsung/universal/universal.c
common/cmd_mmc.c
common/cmd_mtdparts.c
common/cmd_onenand.c
common/cmd_usbd.c
common/env_onenand.c
common/lcd.c
drivers/i2c/soft_i2c.c
include/configs/smdkc100.h
include/lcd.h
include/mmc.h