From: Wolfgang Denk <wd@denx.de>
Date: Sat, 5 Jul 2008 23:15:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
X-Git-Tag: v1.3.4-rc1~90
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d86a0a6f7fe433787edf06aecba9fd6abfecab48;p=u-boot

Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master

Conflicts:

	board/amirix/ap1000/serial.c
	board/exbitgen/exbitgen.c
	board/exbitgen/flash.c
	board/ml2/serial.c
	board/xilinx/ml300/serial.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

d86a0a6f7fe433787edf06aecba9fd6abfecab48