]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
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)
commit995a4b1d83a08223c82c1e15778b02e85e5bba51
tree0acb85278216df76d8fb7284b32d6dd95a1fc978
parenta8d25fc26f681a9c4dfb062ebb4b00b9509a7966
parent44de3e8ff7ed48bf96ec6c5e2173187d9c1c61e6
Merge branch 'master' of git://git.denx.de/u-boot-arm

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>