Merge branch 'master' of git://git.denx.de/u-boot-samsung

author Wolfgang Denk <wd@denx.de>

Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)

committer Wolfgang Denk <wd@denx.de>

Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
author Wolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
committer Wolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
diff --cc Makefile
Simple merge
diff --cc common/serial.c
Simple merge
diff --cc include/serial.h
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/serial.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/serial.h	patch \|	diff1 \|	diff2 \|	blob \| history