]> git.sur5r.net Git - u-boot/commitdiff
projects / u-boot / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8d25fc 44de3e8)
Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Mon, 15 Mar 2010 01:51:36 +0000 (10:51 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Mon, 15 Mar 2010 01:51:36 +0000 (10:51 +0900)
Conflicts:

board/davinci/da830evm/da830evm.c
board/edb93xx/sdram_cfg.c
board/esd/otc570/otc570.c
board/netstar/eeprom.c
board/netstar/eeprom_start.S
cpu/arm920t/ep93xx/timer.c
include/configs/netstar.h
include/configs/otc570.h

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

Trivial merge
Cloned from git://git.denx.de/u-boot.git