Merge branch 'master' of git://git.denx.de/u-boot-samsung
authorWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 22:03:22 +0000 (00:03 +0200)
1  2 
Makefile
common/serial.c
include/serial.h

diff --cc Makefile
Simple merge
diff --cc common/serial.c
Simple merge
Simple merge