]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
authorWolfgang Denk <wd@denx.de>
Sat, 5 Jul 2008 23:15:17 +0000 (01:15 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 5 Jul 2008 23:15:17 +0000 (01:15 +0200)
commitd86a0a6f7fe433787edf06aecba9fd6abfecab48
tree005ba8a000e7bdcab42c1df6339bf7e51dcda2ca
parenta524e112b424c6843800ea2f19d3a8cf01d0aa94
parentf492dd636fbbae529e17533995bc6e5813c007f6
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>