From: Minkyu Kang <mk7.kang@samsung.com>
Date: Mon, 15 Mar 2010 01:51:36 +0000 (+0900)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-arm
X-Git-Tag: v2010.09-rc1~1^2~19^2~18
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=995a4b1d83a08223c82c1e15778b02e85e5bba51;p=oweals%2Fu-boot.git

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>
---

995a4b1d83a08223c82c1e15778b02e85e5bba51